Update smithay to latest commit

src/backend/render/element.rs

@@ -8,7 +8,7 @@ use smithay::{
             Element, Id, RenderElement, UnderlyingStorage,
         },
         glow::{GlowFrame, GlowRenderer},
-        utils::CommitCounter,
+        utils::{CommitCounter, DamageSet},
         Frame, ImportAll, ImportMem, Renderer,
     },
     utils::{Buffer as BufferCoords, Logical, Physical, Point, Rectangle, Scale},
@@ -116,7 +116,7 @@ where
         &self,
         scale: Scale<f64>,
         commit: Option<CommitCounter>,
-    ) -> Vec<Rectangle<i32, Physical>> {
+    ) -> DamageSet<i32, Physical> {
         match self {
             CosmicElement::Workspace(elem) => elem.damage_since(scale, commit),
             CosmicElement::Cursor(elem) => elem.damage_since(scale, commit),
@@ -374,11 +374,11 @@ impl Element for DamageElement {
         &self,
         scale: Scale<f64>,
         _commit: Option<CommitCounter>,
-    ) -> Vec<Rectangle<i32, Physical>> {
-        vec![Rectangle::from_loc_and_size(
+    ) -> DamageSet<i32, Physical> {
+        DamageSet::from_slice(&[Rectangle::from_loc_and_size(
             (0, 0),
             self.geometry(scale).size,
-        )]
+        )])
     }
 }
 

src/backend/render/mod.rs

@@ -938,17 +938,17 @@ where
 }
 
 #[profiling::function]
-pub fn render_output<R, Target, OffTarget>(
+pub fn render_output<'d, R, Target, OffTarget>(
     gpu: Option<&DrmNode>,
     renderer: &mut R,
     target: Target,
-    damage_tracker: &mut OutputDamageTracker,
+    damage_tracker: &'d mut OutputDamageTracker,
     age: usize,
     state: &mut Common,
     output: &Output,
     cursor_mode: CursorMode,
     fps: Option<&mut Fps>,
-) -> Result<RenderOutputResult, RenderError<R>>
+) -> Result<RenderOutputResult<'d>, RenderError<R>>
 where
     R: Renderer
         + ImportAll
@@ -1058,7 +1058,7 @@ where
                                     .bind(render_buffer)
                                     .map_err(RenderError::Rendering)?;
                             }
-                            for rect in damage {
+                            for rect in damage.iter() {
                                 renderer
                                     .blit_from(target.clone(), *rect, *rect, TextureFilter::Nearest)
                                     .map_err(RenderError::Rendering)?;
@@ -1083,11 +1083,11 @@ where
 }
 
 #[profiling::function]
-pub fn render_workspace<R, Target, OffTarget>(
+pub fn render_workspace<'d, R, Target, OffTarget>(
     gpu: Option<&DrmNode>,
     renderer: &mut R,
     target: Target,
-    damage_tracker: &mut OutputDamageTracker,
+    damage_tracker: &'d mut OutputDamageTracker,
     age: usize,
     additional_damage: Option<Vec<Rectangle<i32, Logical>>>,
     state: &mut Common,
@@ -1097,7 +1097,7 @@ pub fn render_workspace<R, Target, OffTarget>(
     cursor_mode: CursorMode,
     mut fps: Option<&mut Fps>,
     exclude_workspace_overview: bool,
-) -> Result<(RenderOutputResult, Vec<CosmicElement<R>>), RenderError<R>>
+) -> Result<(RenderOutputResult<'d>, Vec<CosmicElement<R>>), RenderError<R>>
 where
     R: Renderer
         + ImportAll