entailz/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

fix: store single-pixel colors outside of buffer storage

Browse source
This commit is contained in:
Julian Orth 2024-02-06 14:57:06 +01:00
parent 8abaa3ec87
commit 421be6854b
2 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/ifs/wl_buffer.rs
View file

@ -27,7 +27,6 @@ use {
pub enum WlBufferStorage {
Shm { mem: ClientMemOffset, stride: i32 },
Dmabuf(Rc<dyn GfxImage>),
Color(Color),
}
pub struct WlBuffer {
@ -39,6 +38,7 @@ pub struct WlBuffer {
dmabuf: Option<DmaBuf>,
render_ctx_version: Cell<u32>,
pub storage: RefCell<Option<WlBufferStorage>>,
pub color: Option<Color>,
pub texture: CloneCell<Option<Rc<dyn GfxTexture>>>,
pub famebuffer: CloneCell<Option<Rc<dyn GfxFramebuffer>>>,
width: i32,
@ -75,6 +75,7 @@ impl WlBuffer {
render_ctx_version: Cell::new(client.state.render_ctx_version.get()),
storage: RefCell::new(Some(WlBufferStorage::Dmabuf(img.clone()))),
tracker: Default::default(),
color: None,
}
}
@ -113,6 +114,7 @@ impl WlBuffer {
texture: CloneCell::new(None),
tracker: Default::default(),
famebuffer: Default::default(),
color: None,
})
}
@ -132,14 +134,13 @@ impl WlBuffer {
format: ARGB8888,
dmabuf: None,
render_ctx_version: Cell::new(client.state.render_ctx_version.get()),
storage: RefCell::new(Some(WlBufferStorage::Color(
Color::from_u32_rgba_premultiplied(r, g, b, a),
))),
storage: RefCell::new(None),
width: 1,
height: 1,
texture: CloneCell::new(None),
tracker: Default::default(),
famebuffer: Default::default(),
color: Some(Color::from_u32_rgba_premultiplied(r, g, b, a)),
}
}
@ -197,9 +198,6 @@ impl WlBuffer {
self.texture.set(Some(img.clone().to_texture()?));
}
}
WlBufferStorage::Color(_) => {
// nothing
}
}
Ok(())
}
@ -219,9 +217,6 @@ impl WlBuffer {
self.famebuffer.set(Some(img.clone().to_framebuffer()?));
}
}
WlBufferStorage::Color(_) => {
// nothing
}
}
Ok(())
}