leyoda/cosmic-workspaces
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correctly restrict modifiers in screencopy

Browse source 
Fixes issues for workspace capture in multi-gpu systems. Though I wonder
if the modifiers requested here match the render device...
This commit is contained in:
Ian Douglas Scott 2024-07-18 13:28:56 -07:00
parent f12fdcb17b
commit 2de366939b
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/backend/wayland/buffer.rs
View file

@ -80,6 +80,7 @@ impl AppData {
fn create_gbm_buffer( fn create_gbm_buffer(
&self, &self,
format: u32, format: u32,
modifiers: &[u64],
(width, height): (u32, u32), (width, height): (u32, u32),
needs_linear: bool, needs_linear: bool,
) -> anyhow::Result<Option<Buffer>> { ) -> anyhow::Result<Option<Buffer>> {
@ -100,6 +101,7 @@ impl AppData {
&& (!needs_linear || x.modifier == u64::from(gbm::Modifier::Linear)) && (!needs_linear || x.modifier == u64::from(gbm::Modifier::Linear))
}) })
.map(|x| gbm::Modifier::from(x.modifier)) .map(|x| gbm::Modifier::from(x.modifier))
.filter(|x| modifiers.contains(&u64::from(*x)))
.collect::<Vec<_>>(); .collect::<Vec<_>>();
if modifiers.is_empty() { if modifiers.is_empty() {
@ -178,9 +180,8 @@ impl AppData {
let format = u32::from(wl_shm::Format::Abgr8888); let format = u32::from(wl_shm::Format::Abgr8888);
#[cfg(not(feature = "force-shm-screencopy"))] #[cfg(not(feature = "force-shm-screencopy"))]
if let Some((_, _modifiers)) = formats.dmabuf_formats.iter().find(|(f, _)| *f == format) { if let Some((_, modifiers)) = formats.dmabuf_formats.iter().find(|(f, _)| *f == format) {
// TODO Restrict modifiers match self.create_gbm_buffer(format, &modifiers, formats.buffer_size, false) {
match self.create_gbm_buffer(format, formats.buffer_size, false) {
Ok(Some(buffer)) => { Ok(Some(buffer)) => {
return buffer; return buffer;
} }