From e1fc182c3e6c20fcff5bcdbd7be0a5293bb8cc9b Mon Sep 17 00:00:00 2001
From: Ian Douglas Scott <idscott@system76.com>
Date: Wed, 13 Sep 2023 20:24:11 -0700
Subject: [PATCH] Update Smithay

---
 Cargo.lock                   |  2 +-
 Cargo.toml                   |  2 +-
 src/backend/render/cursor.rs |  4 ++++
 src/backend/render/mod.rs    | 12 ++++++++++--
 src/shell/element/surface.rs | 12 ++++++++++--
 src/utils/iced.rs            |  3 ++-
 6 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9f8989e0..1094454a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3761,7 +3761,7 @@ checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
 [[package]]
 name = "smithay"
 version = "0.3.0"
-source = "git+https://github.com/smithay//smithay?rev=1a61e1c13a#1a61e1c13a8d6996e28741a5ecdb09af4981c17d"
+source = "git+https://github.com/smithay//smithay?rev=5affbde525#5affbde5256ada864d98804933959e1dcb2129e0"
 dependencies = [
  "appendlist",
  "ash",
diff --git a/Cargo.toml b/Cargo.toml
index bf2e7630..2375d254 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -87,4 +87,4 @@ debug = true
 lto = "fat"
 
 [patch."https://github.com/Smithay/smithay.git"]
-smithay = { git = "https://github.com/smithay//smithay", rev = "1a61e1c13a" }
+smithay = { git = "https://github.com/smithay//smithay", rev = "5affbde525" }
diff --git a/src/backend/render/cursor.rs b/src/backend/render/cursor.rs
index 1e735326..24816e03 100644
--- a/src/backend/render/cursor.rs
+++ b/src/backend/render/cursor.rs
@@ -8,6 +8,7 @@ use smithay::{
             element::{
                 surface::{render_elements_from_surface_tree, WaylandSurfaceRenderElement},
                 texture::{TextureBuffer, TextureRenderElement},
+                Kind,
             },
             ImportAll, ImportMem, Renderer,
         },
@@ -170,6 +171,7 @@ where
         position.to_physical_precise_round(scale),
         scale,
         1.0,
+        Kind::Cursor,
     )
 }
 
@@ -199,6 +201,7 @@ where
         location.into().to_physical_precise_round(scale),
         scale,
         1.0,
+        Kind::Cursor,
     )
 }
 
@@ -344,6 +347,7 @@ where
                 None,
                 None,
                 None,
+                Kind::Cursor,
             ),
         )];
     } else {
diff --git a/src/backend/render/mod.rs b/src/backend/render/mod.rs
index 75ad2b56..75e31d39 100644
--- a/src/backend/render/mod.rs
+++ b/src/backend/render/mod.rs
@@ -44,7 +44,7 @@ use smithay::{
             element::{
                 surface::render_elements_from_surface_tree,
                 utils::{Relocate, RelocateRenderElement},
-                Element, Id, RenderElement,
+                Element, Id, Kind, RenderElement,
             },
             gles::{
                 element::PixelShaderElement, GlesError, GlesPixelProgram, GlesRenderer, Uniform,
@@ -234,6 +234,7 @@ impl IndicatorShader {
                     Uniform::new("thickness", thickness),
                     Uniform::new("radius", radius as f32),
                 ],
+                Kind::Unspecified,
             );
             cache.insert(key.clone(), (settings, elem));
         }
@@ -313,6 +314,7 @@ impl BackdropShader {
                     ),
                     Uniform::new("radius", radius),
                 ],
+                Kind::Unspecified,
             );
             cache.insert(key.clone(), (settings, elem));
         }
@@ -729,12 +731,18 @@ where
                         location + offset,
                         scale,
                         1.0,
+                        Kind::Unspecified,
                     )
                 },
             ));
 
             layer_elements.extend(render_elements_from_surface_tree(
-                renderer, surface, location, scale, 1.0,
+                renderer,
+                surface,
+                location,
+                scale,
+                1.0,
+                Kind::Unspecified,
             ));
         });
 
diff --git a/src/shell/element/surface.rs b/src/shell/element/surface.rs
index a7533cdf..d6506041 100644
--- a/src/shell/element/surface.rs
+++ b/src/shell/element/surface.rs
@@ -3,6 +3,7 @@ use std::time::Duration;
 use smithay::{
     backend::renderer::{
         element::{
+            self,
             surface::{render_elements_from_surface_tree, WaylandSurfaceRenderElement},
             utils::select_dmabuf_feedback,
             AsRenderElements, RenderElementStates,
@@ -620,12 +621,19 @@ impl CosmicSurface {
                             location + offset,
                             scale,
                             alpha,
+                            element::Kind::Unspecified,
                         )
                     })
                     .collect();
 
-                let window_render_elements =
-                    render_elements_from_surface_tree(renderer, surface, location, scale, alpha);
+                let window_render_elements = render_elements_from_surface_tree(
+                    renderer,
+                    surface,
+                    location,
+                    scale,
+                    alpha,
+                    element::Kind::Unspecified,
+                );
 
                 (window_render_elements, popup_render_elements)
             }
diff --git a/src/utils/iced.rs b/src/utils/iced.rs
index fb90d6e9..34ee3f12 100644
--- a/src/utils/iced.rs
+++ b/src/utils/iced.rs
@@ -37,7 +37,7 @@ use smithay::{
         renderer::{
             element::{
                 memory::{MemoryRenderBuffer, MemoryRenderBufferRenderElement},
-                AsRenderElements,
+                AsRenderElements, Kind,
             },
             ImportMem, Renderer,
         },
@@ -811,6 +811,7 @@ where
                     size.to_f64().to_logical(1.0, Transform::Normal),
                 )),
                 Some(internal_ref.size),
+                Kind::Unspecified,
             ) {
                 return vec![C::from(buffer)];
             }