Update Smithay

This commit is contained in:
Ian Douglas Scott 2023-09-13 20:24:11 -07:00
parent af457ef723
commit e1fc182c3e
6 changed files with 28 additions and 7 deletions

2
Cargo.lock generated
View file

@ -3761,7 +3761,7 @@ checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
[[package]] [[package]]
name = "smithay" name = "smithay"
version = "0.3.0" 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 = [ dependencies = [
"appendlist", "appendlist",
"ash", "ash",

View file

@ -87,4 +87,4 @@ debug = true
lto = "fat" lto = "fat"
[patch."https://github.com/Smithay/smithay.git"] [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" }

View file

@ -8,6 +8,7 @@ use smithay::{
element::{ element::{
surface::{render_elements_from_surface_tree, WaylandSurfaceRenderElement}, surface::{render_elements_from_surface_tree, WaylandSurfaceRenderElement},
texture::{TextureBuffer, TextureRenderElement}, texture::{TextureBuffer, TextureRenderElement},
Kind,
}, },
ImportAll, ImportMem, Renderer, ImportAll, ImportMem, Renderer,
}, },
@ -170,6 +171,7 @@ where
position.to_physical_precise_round(scale), position.to_physical_precise_round(scale),
scale, scale,
1.0, 1.0,
Kind::Cursor,
) )
} }
@ -199,6 +201,7 @@ where
location.into().to_physical_precise_round(scale), location.into().to_physical_precise_round(scale),
scale, scale,
1.0, 1.0,
Kind::Cursor,
) )
} }
@ -344,6 +347,7 @@ where
None, None,
None, None,
None, None,
Kind::Cursor,
), ),
)]; )];
} else { } else {

View file

@ -44,7 +44,7 @@ use smithay::{
element::{ element::{
surface::render_elements_from_surface_tree, surface::render_elements_from_surface_tree,
utils::{Relocate, RelocateRenderElement}, utils::{Relocate, RelocateRenderElement},
Element, Id, RenderElement, Element, Id, Kind, RenderElement,
}, },
gles::{ gles::{
element::PixelShaderElement, GlesError, GlesPixelProgram, GlesRenderer, Uniform, element::PixelShaderElement, GlesError, GlesPixelProgram, GlesRenderer, Uniform,
@ -234,6 +234,7 @@ impl IndicatorShader {
Uniform::new("thickness", thickness), Uniform::new("thickness", thickness),
Uniform::new("radius", radius as f32), Uniform::new("radius", radius as f32),
], ],
Kind::Unspecified,
); );
cache.insert(key.clone(), (settings, elem)); cache.insert(key.clone(), (settings, elem));
} }
@ -313,6 +314,7 @@ impl BackdropShader {
), ),
Uniform::new("radius", radius), Uniform::new("radius", radius),
], ],
Kind::Unspecified,
); );
cache.insert(key.clone(), (settings, elem)); cache.insert(key.clone(), (settings, elem));
} }
@ -729,12 +731,18 @@ where
location + offset, location + offset,
scale, scale,
1.0, 1.0,
Kind::Unspecified,
) )
}, },
)); ));
layer_elements.extend(render_elements_from_surface_tree( layer_elements.extend(render_elements_from_surface_tree(
renderer, surface, location, scale, 1.0, renderer,
surface,
location,
scale,
1.0,
Kind::Unspecified,
)); ));
}); });

View file

@ -3,6 +3,7 @@ use std::time::Duration;
use smithay::{ use smithay::{
backend::renderer::{ backend::renderer::{
element::{ element::{
self,
surface::{render_elements_from_surface_tree, WaylandSurfaceRenderElement}, surface::{render_elements_from_surface_tree, WaylandSurfaceRenderElement},
utils::select_dmabuf_feedback, utils::select_dmabuf_feedback,
AsRenderElements, RenderElementStates, AsRenderElements, RenderElementStates,
@ -620,12 +621,19 @@ impl CosmicSurface {
location + offset, location + offset,
scale, scale,
alpha, alpha,
element::Kind::Unspecified,
) )
}) })
.collect(); .collect();
let window_render_elements = let window_render_elements = render_elements_from_surface_tree(
render_elements_from_surface_tree(renderer, surface, location, scale, alpha); renderer,
surface,
location,
scale,
alpha,
element::Kind::Unspecified,
);
(window_render_elements, popup_render_elements) (window_render_elements, popup_render_elements)
} }

View file

@ -37,7 +37,7 @@ use smithay::{
renderer::{ renderer::{
element::{ element::{
memory::{MemoryRenderBuffer, MemoryRenderBufferRenderElement}, memory::{MemoryRenderBuffer, MemoryRenderBufferRenderElement},
AsRenderElements, AsRenderElements, Kind,
}, },
ImportMem, Renderer, ImportMem, Renderer,
}, },
@ -811,6 +811,7 @@ where
size.to_f64().to_logical(1.0, Transform::Normal), size.to_f64().to_logical(1.0, Transform::Normal),
)), )),
Some(internal_ref.size), Some(internal_ref.size),
Kind::Unspecified,
) { ) {
return vec![C::from(buffer)]; return vec![C::from(buffer)];
} }