leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update smithay with ContextId changes

Browse source 
The new type bounds seem to be addressable using `AsGlowRenderer`.

Though things like this will need a different solution when we want to
support Pixman rendering.
This commit is contained in:
Ian Douglas Scott 2025-04-28 12:38:23 -07:00 • committed by Victoria Brekenfeld
parent ae1d9ae7ef
commit 982af8ff10
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -4736,7 +4736,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]] [[package]]
name = "smithay" name = "smithay"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/smithay/smithay//?rev=ce61c9b#ce61c9b3293b13adf03863848426f0d7c4907c3e" source = "git+https://github.com/smithay/smithay//?rev=14b51bd#14b51bd896fe46ba048fe6fd24136455eb36dbee"
dependencies = [ dependencies = [
"aliasable", "aliasable",
"appendlist", "appendlist",

2
Cargo.toml
View file

@ -124,4 +124,4 @@ cosmic-protocols = { git = "https://github.com/pop-os//cosmic-protocols", branch
cosmic-client-toolkit = { git = "https://github.com/pop-os//cosmic-protocols", branch = "main" } cosmic-client-toolkit = { git = "https://github.com/pop-os//cosmic-protocols", branch = "main" }
[patch."https://github.com/smithay/smithay"] [patch."https://github.com/smithay/smithay"]
smithay = { git = "https://github.com/smithay/smithay//", rev = "ce61c9b" } smithay = { git = "https://github.com/smithay/smithay//", rev = "14b51bd" }

15
src/backend/render/mod.rs
View file

@ -1011,7 +1011,7 @@ pub struct PostprocessState {
} }
impl PostprocessState { impl PostprocessState {
pub fn new_with_renderer<R: Renderer + Offscreen<GlesTexture>>( pub fn new_with_renderer<R: AsGlowRenderer + Offscreen<GlesTexture>>(
renderer: &mut R, renderer: &mut R,
format: Fourcc, format: Fourcc,
output_config: PostprocessOutputConfig, output_config: PostprocessOutputConfig,
@ -1022,7 +1022,7 @@ impl PostprocessState {
let texture = Offscreen::<GlesTexture>::create_buffer(renderer, format, buffer_size)?; let texture = Offscreen::<GlesTexture>::create_buffer(renderer, format, buffer_size)?;
let texture_buffer = TextureRenderBuffer::from_texture( let texture_buffer = TextureRenderBuffer::from_texture(
renderer, renderer.glow_renderer(),
texture, texture,
1, 1,
Transform::Normal, Transform::Normal,
@ -1042,7 +1042,7 @@ impl PostprocessState {
}) })
} }
pub fn track_cursor<R: Renderer + Offscreen<GlesTexture>>( pub fn track_cursor<R: AsGlowRenderer + Offscreen<GlesTexture>>(
&mut self, &mut self,
renderer: &mut R, renderer: &mut R,
format: Fourcc, format: Fourcc,
@ -1069,8 +1069,13 @@ impl PostprocessState {
let texture = Offscreen::<GlesTexture>::create_buffer(renderer, format, buffer_size)?; let texture = Offscreen::<GlesTexture>::create_buffer(renderer, format, buffer_size)?;
let texture_buffer = let texture_buffer = TextureRenderBuffer::from_texture(
TextureRenderBuffer::from_texture(renderer, texture, 1, Transform::Normal, None); renderer.glow_renderer(),
texture,
1,
Transform::Normal,
None,
);
let damage_tracker = OutputDamageTracker::new(size, scale, Transform::Normal); let damage_tracker = OutputDamageTracker::new(size, scale, Transform::Normal);