me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Support out-of-order Buffer ages in iced_tiny_skia

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-01-18 10:35:27 +01:00
parent 5fc49edc55
commit 4b7744b980
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
1 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

32
tiny_skia/src/window/compositor.rs
View file

@ -20,9 +20,9 @@ pub struct Surface {
Box<dyn compositor::Window>, Box<dyn compositor::Window>,
>, >,
clip_mask: tiny_skia::Mask, clip_mask: tiny_skia::Mask,
// Primitives of existing buffers, by decreasing age primitive_stack: VecDeque<Vec<Primitive>>,
primitives: VecDeque<Vec<Primitive>>,
background_color: Color, background_color: Color,
max_age: u8,
} }
impl<Theme> crate::graphics::Compositor for Compositor<Theme> { impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
@ -61,8 +61,9 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
window, window,
clip_mask: tiny_skia::Mask::new(width, height) clip_mask: tiny_skia::Mask::new(width, height)
.expect("Create clip mask"), .expect("Create clip mask"),
primitives: VecDeque::new(), primitive_stack: VecDeque::new(),
background_color: Color::BLACK, background_color: Color::BLACK,
max_age: 0,
} }
} }
@ -74,7 +75,7 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
) { ) {
surface.clip_mask = surface.clip_mask =
tiny_skia::Mask::new(width, height).expect("Create clip mask"); tiny_skia::Mask::new(width, height).expect("Create clip mask");
surface.primitives.clear(); surface.primitive_stack.clear();
} }
fn fetch_information(&self) -> Information { fn fetch_information(&self) -> Information {
@ -159,7 +160,6 @@ pub fn present<T: AsRef<str>>(
) )
.unwrap(); .unwrap();
// TODO Add variants to `SurfaceError`?
let mut buffer = surface let mut buffer = surface
.window .window
.buffer_mut() .buffer_mut()
@ -167,27 +167,25 @@ pub fn present<T: AsRef<str>>(
let age = buffer.age(); let age = buffer.age();
// Forget primatives for back buffers older than `age` let last_primitives = {
// Or if this is a new buffer, keep at most two. surface.max_age = surface.max_age.max(age);
let max = if age == 0 { 2 } else { age }; surface.primitive_stack.truncate(surface.max_age as usize);
while surface.primitives.len() as u8 > max {
let _ = surface.primitives.pop_front();
}
let last_primitives = if surface.primitives.len() as u8 == age { if age > 0 {
surface.primitives.pop_front() surface.primitive_stack.get(age as usize - 1)
} else { } else {
None None
}
}; };
let damage = last_primitives let damage = last_primitives
.and_then(|last_primitives| { .and_then(|last_primitives| {
(surface.background_color == background_color) (surface.background_color == background_color)
.then(|| damage::list(&last_primitives, primitives)) .then(|| damage::list(last_primitives, primitives))
}) })
.unwrap_or_else(|| vec![Rectangle::with_size(viewport.logical_size())]); .unwrap_or_else(|| vec![Rectangle::with_size(viewport.logical_size())]);
surface.primitives.push_back(primitives.to_vec()); surface.primitive_stack.push_front(primitives.to_vec());
surface.background_color = background_color; surface.background_color = background_color;
if !damage.is_empty() { if !damage.is_empty() {