Skip to content

Fix tiny-skia damage handling #3032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix tiny-skia damage handling #3032

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d84ac0
fix: Use frame damage to short-circuit tiny-skia rendering
Ottatop Aug 9, 2025
f557716
Present tiny-skia buffers with damage
Ottatop Aug 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 50 additions & 12 deletions tiny_skia/src/window/compositor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,26 @@ pub fn present(
.buffer_mut()
.map_err(|_| compositor::SurfaceError::Lost)?;

let last_layers = {
let last_presented_layers = surface.layer_stack.front();

let frame_damage = last_presented_layers
.and_then(|last_presented_layers| {
(surface.background_color == background_color).then(|| {
damage::diff(
last_presented_layers,
renderer.layers(),
|layer| vec![layer.bounds],
Layer::damage,
)
})
})
.unwrap_or_else(|| vec![Rectangle::with_size(viewport.logical_size())]);

if frame_damage.is_empty() {
return Ok(());
}

let last_buffer_layers = {
let age = buffer.age();

surface.max_age = surface.max_age.max(age);
Expand All @@ -172,11 +191,11 @@ pub fn present(
}
};

let damage = last_layers
.and_then(|last_layers| {
let buffer_damage = last_buffer_layers
.and_then(|last_buffer_layers| {
(surface.background_color == background_color).then(|| {
damage::diff(
last_layers,
last_buffer_layers,
renderer.layers(),
|layer| vec![layer.bounds],
Layer::damage,
Expand All @@ -185,15 +204,13 @@ pub fn present(
})
.unwrap_or_else(|| vec![Rectangle::with_size(viewport.logical_size())]);

if damage.is_empty() {
return Ok(());
}

surface.layer_stack.push_front(renderer.layers().to_vec());
surface.background_color = background_color;

let damage =
damage::group(damage, Rectangle::with_size(viewport.logical_size()));
let buffer_damage = damage::group(
buffer_damage,
Rectangle::with_size(viewport.logical_size()),
);

let mut pixels = tiny_skia::PixmapMut::from_bytes(
bytemuck::cast_slice_mut(&mut buffer),
Expand All @@ -206,12 +223,33 @@ pub fn present(
&mut pixels,
&mut surface.clip_mask,
viewport,
&damage,
&buffer_damage,
background_color,
);

let frame_damage = damage::group(
frame_damage,
Rectangle::with_size(viewport.logical_size()),
)
.into_iter()
.map(|rect| rect * viewport.scale_factor() as f32)
.filter_map(|rect| {
let width = (rect.x - rect.x.floor() + rect.width).ceil() as u32;
let height = (rect.y - rect.y.floor() + rect.height).ceil() as u32;

Some(softbuffer::Rect {
x: rect.x.floor() as u32,
y: rect.y.floor() as u32,
width: width.try_into().ok()?,
height: height.try_into().ok()?,
})
})
.collect::<Vec<_>>();

on_pre_present();
buffer.present().map_err(|_| compositor::SurfaceError::Lost)
buffer
.present_with_damage(&frame_damage)
.map_err(|_| compositor::SurfaceError::Lost)
}

pub fn screenshot(
Expand Down