Skip to content

Commit 982af8f

Browse files
ids1024Drakulix
authored andcommitted
Update smithay with ContextId changes
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.
1 parent ae1d9ae commit 982af8f

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,4 +124,4 @@ cosmic-protocols = { git = "https://github.com/pop-os//cosmic-protocols", branch
124124
cosmic-client-toolkit = { git = "https://github.com/pop-os//cosmic-protocols", branch = "main" }
125125

126126
[patch."https://github.com/smithay/smithay"]
127-
smithay = { git = "https://github.com/smithay/smithay//", rev = "ce61c9b" }
127+
smithay = { git = "https://github.com/smithay/smithay//", rev = "14b51bd" }

src/backend/render/mod.rs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,7 +1011,7 @@ pub struct PostprocessState {
10111011
}
10121012

10131013
impl PostprocessState {
1014-
pub fn new_with_renderer<R: Renderer + Offscreen<GlesTexture>>(
1014+
pub fn new_with_renderer<R: AsGlowRenderer + Offscreen<GlesTexture>>(
10151015
renderer: &mut R,
10161016
format: Fourcc,
10171017
output_config: PostprocessOutputConfig,
@@ -1022,7 +1022,7 @@ impl PostprocessState {
10221022

10231023
let texture = Offscreen::<GlesTexture>::create_buffer(renderer, format, buffer_size)?;
10241024
let texture_buffer = TextureRenderBuffer::from_texture(
1025-
renderer,
1025+
renderer.glow_renderer(),
10261026
texture,
10271027
1,
10281028
Transform::Normal,
@@ -1042,7 +1042,7 @@ impl PostprocessState {
10421042
})
10431043
}
10441044

1045-
pub fn track_cursor<R: Renderer + Offscreen<GlesTexture>>(
1045+
pub fn track_cursor<R: AsGlowRenderer + Offscreen<GlesTexture>>(
10461046
&mut self,
10471047
renderer: &mut R,
10481048
format: Fourcc,
@@ -1069,8 +1069,13 @@ impl PostprocessState {
10691069

10701070
let texture = Offscreen::<GlesTexture>::create_buffer(renderer, format, buffer_size)?;
10711071

1072-
let texture_buffer =
1073-
TextureRenderBuffer::from_texture(renderer, texture, 1, Transform::Normal, None);
1072+
let texture_buffer = TextureRenderBuffer::from_texture(
1073+
renderer.glow_renderer(),
1074+
texture,
1075+
1,
1076+
Transform::Normal,
1077+
None,
1078+
);
10741079

10751080
let damage_tracker = OutputDamageTracker::new(size, scale, Transform::Normal);
10761081

0 commit comments

Comments
 (0)