From 7e0d3d31f719615a3da99325d5797a96ae1fa5d2 Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Tue, 9 Apr 2024 19:06:13 +0400
Subject: Update Smithay

---
 src/render_helpers/gradient.rs                 | 4 ++--
 src/render_helpers/mod.rs                      | 3 +--
 src/render_helpers/offscreen.rs                | 4 ++--
 src/render_helpers/primary_gpu_pixel_shader.rs | 4 ++--
 src/render_helpers/primary_gpu_texture.rs      | 4 ++--
 src/render_helpers/render_elements.rs          | 2 +-
 6 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'src/render_helpers')

diff --git a/src/render_helpers/gradient.rs b/src/render_helpers/gradient.rs
index 62fd3714..958c2f9e 100644
--- a/src/render_helpers/gradient.rs
+++ b/src/render_helpers/gradient.rs
@@ -2,7 +2,7 @@ use glam::Vec2;
 use smithay::backend::renderer::element::{Element, Id, Kind, RenderElement, UnderlyingStorage};
 use smithay::backend::renderer::gles::element::PixelShaderElement;
 use smithay::backend::renderer::gles::{GlesError, GlesFrame, GlesRenderer, Uniform};
-use smithay::backend::renderer::utils::CommitCounter;
+use smithay::backend::renderer::utils::{CommitCounter, DamageSet};
 use smithay::utils::{Buffer, Logical, Physical, Rectangle, Scale, Transform};
 
 use super::primary_gpu_pixel_shader::PrimaryGpuPixelShaderRenderElement;
@@ -85,7 +85,7 @@ impl Element for GradientRenderElement {
         &self,
         scale: Scale<f64>,
         commit: Option<CommitCounter>,
-    ) -> Vec<Rectangle<i32, Physical>> {
+    ) -> DamageSet<i32, Physical> {
         self.0.damage_since(scale, commit)
     }
 
diff --git a/src/render_helpers/mod.rs b/src/render_helpers/mod.rs
index f0d61fbe..238ad8ec 100644
--- a/src/render_helpers/mod.rs
+++ b/src/render_helpers/mod.rs
@@ -64,8 +64,7 @@ pub fn render_and_download(
 ) -> anyhow::Result<GlesMapping> {
     let _span = tracy_client::span!();
 
-    let (_, sync_point) = render_to_texture(renderer, size, scale, transform, fourcc, elements)?;
-    sync_point.wait();
+    let (_, _) = render_to_texture(renderer, size, scale, transform, fourcc, elements)?;
 
     let buffer_size = size.to_logical(1).to_buffer(1, Transform::Normal);
     let mapping = renderer
diff --git a/src/render_helpers/offscreen.rs b/src/render_helpers/offscreen.rs
index 72c2471b..60e495ca 100644
--- a/src/render_helpers/offscreen.rs
+++ b/src/render_helpers/offscreen.rs
@@ -4,7 +4,7 @@ use smithay::backend::renderer::element::texture::{TextureBuffer, TextureRenderE
 use smithay::backend::renderer::element::utils::{Relocate, RelocateRenderElement};
 use smithay::backend::renderer::element::{Element, Id, Kind, RenderElement, UnderlyingStorage};
 use smithay::backend::renderer::gles::{GlesError, GlesFrame, GlesRenderer};
-use smithay::backend::renderer::utils::CommitCounter;
+use smithay::backend::renderer::utils::{CommitCounter, DamageSet};
 use smithay::utils::{Buffer, Physical, Rectangle, Scale, Transform};
 
 use super::primary_gpu_texture::PrimaryGpuTextureRenderElement;
@@ -130,7 +130,7 @@ impl Element for OffscreenRenderElement {
         &self,
         scale: Scale<f64>,
         commit: Option<CommitCounter>,
-    ) -> Vec<Rectangle<i32, Physical>> {
+    ) -> DamageSet<i32, Physical> {
         if let Some(texture) = &self.texture {
             texture.damage_since(scale, commit)
         } else {
diff --git a/src/render_helpers/primary_gpu_pixel_shader.rs b/src/render_helpers/primary_gpu_pixel_shader.rs
index b3b75023..7564a50f 100644
--- a/src/render_helpers/primary_gpu_pixel_shader.rs
+++ b/src/render_helpers/primary_gpu_pixel_shader.rs
@@ -1,7 +1,7 @@
 use smithay::backend::renderer::element::{Element, Id, Kind, RenderElement, UnderlyingStorage};
 use smithay::backend::renderer::gles::element::PixelShaderElement;
 use smithay::backend::renderer::gles::{GlesError, GlesFrame, GlesRenderer};
-use smithay::backend::renderer::utils::CommitCounter;
+use smithay::backend::renderer::utils::{CommitCounter, DamageSet};
 use smithay::utils::{Buffer, Physical, Rectangle, Scale, Transform};
 
 use super::renderer::AsGlesFrame;
@@ -36,7 +36,7 @@ impl Element for PrimaryGpuPixelShaderRenderElement {
         &self,
         scale: Scale<f64>,
         commit: Option<CommitCounter>,
-    ) -> Vec<Rectangle<i32, Physical>> {
+    ) -> DamageSet<i32, Physical> {
         self.0.damage_since(scale, commit)
     }
 
diff --git a/src/render_helpers/primary_gpu_texture.rs b/src/render_helpers/primary_gpu_texture.rs
index 5ec50a6e..571d3927 100644
--- a/src/render_helpers/primary_gpu_texture.rs
+++ b/src/render_helpers/primary_gpu_texture.rs
@@ -1,7 +1,7 @@
 use smithay::backend::renderer::element::texture::TextureRenderElement;
 use smithay::backend::renderer::element::{Element, Id, Kind, RenderElement, UnderlyingStorage};
 use smithay::backend::renderer::gles::{GlesError, GlesFrame, GlesRenderer, GlesTexture};
-use smithay::backend::renderer::utils::CommitCounter;
+use smithay::backend::renderer::utils::{CommitCounter, DamageSet};
 use smithay::utils::{Buffer, Physical, Rectangle, Scale, Transform};
 
 use super::renderer::AsGlesFrame;
@@ -36,7 +36,7 @@ impl Element for PrimaryGpuTextureRenderElement {
         &self,
         scale: Scale<f64>,
         commit: Option<CommitCounter>,
-    ) -> Vec<Rectangle<i32, Physical>> {
+    ) -> DamageSet<i32, Physical> {
         self.0.damage_since(scale, commit)
     }
 
diff --git a/src/render_helpers/render_elements.rs b/src/render_helpers/render_elements.rs
index 84673131..b314d118 100644
--- a/src/render_helpers/render_elements.rs
+++ b/src/render_helpers/render_elements.rs
@@ -69,7 +69,7 @@ macro_rules! niri_render_elements {
                 &self,
                 scale: smithay::utils::Scale<f64>,
                 commit: Option<smithay::backend::renderer::utils::CommitCounter>,
-            ) -> Vec<smithay::utils::Rectangle<i32, smithay::utils::Physical>> {
+            ) -> smithay::backend::renderer::utils::DamageSet<i32, smithay::utils::Physical> {
                 match self {
                     $($name::$variant(elem) => elem.damage_since(scale, commit)),+
                 }
-- 
cgit