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]]
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",

View file

@ -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" }

View file

@ -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 {

View file

@ -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,
));
});

View file

@ -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)
}

View file

@ -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)];
}