Add a Buffer::age() method

Fixes https://github.com/rust-windowing/softbuffer/issues/90.
This commit is contained in:
Ian Douglas Scott 2023-04-20 18:52:34 -07:00
parent c1d6716eec
commit 29b3f4a978
8 changed files with 126 additions and 20 deletions

View file

@ -90,6 +90,7 @@ pub(super) struct WaylandBuffer {
width: i32,
height: i32,
released: Arc<AtomicBool>,
pub age: u8,
}
impl WaylandBuffer {
@ -125,6 +126,7 @@ impl WaylandBuffer {
width,
height,
released,
age: 0,
}
}

View file

@ -125,9 +125,14 @@ impl WaylandImpl {
));
};
Ok(BufferImpl(util::BorrowStack::new(self, |buffer| {
Ok(unsafe { buffer.buffers.as_mut().unwrap().1.mapped_mut() })
})?))
let age = self.buffers.as_mut().unwrap().1.age;
Ok(BufferImpl {
stack: util::BorrowStack::new(self, |buffer| {
Ok(unsafe { buffer.buffers.as_mut().unwrap().1.mapped_mut() })
})?,
age,
})
}
fn present_with_damage(&mut self, damage: &[Rect]) -> Result<(), SoftBufferError> {
@ -138,6 +143,11 @@ impl WaylandImpl {
.dispatch_pending(&mut State);
if let Some((front, back)) = &mut self.buffers {
front.age = 1;
if back.age != 0 {
back.age += 1;
}
// Swap front and back buffer
std::mem::swap(front, back);
@ -170,25 +180,32 @@ impl WaylandImpl {
}
}
pub struct BufferImpl<'a>(util::BorrowStack<'a, WaylandImpl, [u32]>);
pub struct BufferImpl<'a> {
stack: util::BorrowStack<'a, WaylandImpl, [u32]>,
age: u8,
}
impl<'a> BufferImpl<'a> {
#[inline]
pub fn pixels(&self) -> &[u32] {
self.0.member()
self.stack.member()
}
#[inline]
pub fn pixels_mut(&mut self) -> &mut [u32] {
self.0.member_mut()
self.stack.member_mut()
}
pub fn age(&self) -> u8 {
self.age
}
pub fn present_with_damage(self, damage: &[Rect]) -> Result<(), SoftBufferError> {
self.0.into_container().present_with_damage(damage)
self.stack.into_container().present_with_damage(damage)
}
pub fn present(self) -> Result<(), SoftBufferError> {
let imp = self.0.into_container();
let imp = self.stack.into_container();
let (width, height) = imp
.size
.expect("Must set size of surface before calling `present()`");