Merge pull request #173 from pop-os/update-smithay_jammy

Update Smithay
pop-os · Sep 14, 2023 · 7167285 · 7167285
2 parents af457ef + 003263b
commit 7167285
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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::Unspecified,
     )
 }
 
@@ -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
@@ -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
@@ -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
@@ -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)];
             }