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

screencopy: Fix damage tracking bug with shm screencopy of output

Browse source 
Similar to the change in https://github.com/pop-os/cosmic-comp/pull/780,
but also updates it to be a little clearer than just an uncommented `age
= 0` line.

Ideally we want some robust system to re-use the offscreen buffer (but
not allocate more buffers indefinitely if the client doesn't capture
with the same `wl_buffer`).
This commit is contained in:
Ian Douglas Scott 2025-07-03 13:41:40 -07:00 • committed by Victoria Brekenfeld
parent e5fbf21fee
commit 8ef6c161a0
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/backend/kms/surface/mod.rs
View file

@ -39,7 +39,7 @@ use smithay::{
},
egl::EGLContext,
renderer::{
buffer_dimensions,
buffer_dimensions, buffer_type,
damage::Error as RenderError,
element::{
texture::TextureRenderElement,
@ -56,7 +56,7 @@ use smithay::{
multigpu::{ApiDevice, Error as MultiError, GpuManager},
sync::SyncPoint,
utils::with_renderer_surface_state,
Bind, Blit, Frame, ImportDma, Offscreen, Renderer, RendererSuper, Texture,
Bind, Blit, BufferType, Frame, ImportDma, Offscreen, Renderer, RendererSuper, Texture,
TextureFilter,
},
},
@ -1617,7 +1617,12 @@ fn take_screencopy_frames(
};
let buffer = frame.buffer();
let age = damage_tracking.age_for_buffer(&buffer);
let age = if matches!(buffer_type(&frame.buffer()), Some(BufferType::Shm)) {
// TODO re-use offscreen buffer to damage track screencopy to shm
0
} else {
damage_tracking.age_for_buffer(&buffer)
};
let res = damage_tracking.dt.damage_output(age, &elements);
if let Some(old_len) = old_len {

10
src/wayland/handlers/screencopy/render.rs
View file

@ -172,7 +172,12 @@ where
})
.transpose()?;
let age = session_damage_tracking.age_for_buffer(&buffer);
let age = if offscreen.is_some() {
// TODO re-use offscreen buffer to damage track screencopy to shm
0
} else {
session_damage_tracking.age_for_buffer(&buffer)
};
let mut fb = offscreen
.as_mut()
.map(|tex| renderer.bind(tex).map_err(DTError::Rendering))
@ -242,7 +247,7 @@ pub fn render_workspace_to_buffer(
renderer: &mut R,
offscreen: Option<&mut R::Framebuffer<'_>>,
dt: &'d mut OutputDamageTracker,
mut age: usize,
age: usize,
additional_damage: Vec<Rectangle<i32, BufferCoords>>,
draw_cursor: bool,
common: &mut Common,
@ -311,7 +316,6 @@ pub fn render_workspace_to_buffer(
.map(|res| res.0)
} else {
let target = offscreen.expect("shm buffers should have an offscreen target");
age = 0;
render_workspace(
None,
renderer,