Merge remote-tracking branch 'origin/master' into damage

This commit is contained in:
Ian Douglas Scott 2023-06-02 15:03:10 -07:00
commit 1e7b9213d2
13 changed files with 265 additions and 23 deletions

View file

@ -126,7 +126,6 @@ impl WaylandImpl {
};
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() })
@ -135,6 +134,11 @@ impl WaylandImpl {
})
}
/// Fetch the buffer from the window.
pub fn fetch(&mut self) -> Result<Vec<u32>, SoftBufferError> {
Err(SoftBufferError::Unimplemented)
}
fn present_with_damage(&mut self, damage: &[Rect]) -> Result<(), SoftBufferError> {
let _ = self
.display