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

allocator: don't require render usage for bridged buffers

Browse source
This commit is contained in:
Julian Orth 2024-09-05 11:48:30 +02:00
parent 1bacaa7b02
commit bf65da4c76
15 changed files with 152 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/screenshoter.rs
View file

@ -1,12 +1,13 @@
use {
crate::{
allocator::{AllocatorError, BufferObject, BO_USE_RENDERING},
allocator::{AllocatorError, BufferObject, BufferUsage, BO_USE_RENDERING},
format::XRGB8888,
gfx_api::GfxError,
gfx_api::{needs_render_usage, GfxError},
scale::Scale,
state::State,
video::drm::DrmError,
},
indexmap::IndexMap,
jay_config::video::Transform,
std::{ops::Deref, rc::Rc},
thiserror::Error,
@ -49,17 +50,22 @@ pub fn take_screenshot(
return Err(ScreenshooterError::EmptyDisplay);
}
let formats = ctx.formats();
let modifiers: Vec<_> = match formats.get(&XRGB8888.drm) {
let modifiers: IndexMap<_, _> = match formats.get(&XRGB8888.drm) {
None => return Err(ScreenshooterError::XRGB8888),
Some(f) => f
.write_modifiers
.intersection(&f.read_modifiers)
.copied()
.iter()
.filter(|(m, _)| f.read_modifiers.contains(*m))
.collect(),
};
if modifiers.is_empty() {
return Err(ScreenshooterError::Modifiers);
}
let mut usage = BO_USE_RENDERING;
if !needs_render_usage(modifiers.values().copied()) {
usage = BufferUsage::none();
}
let modifiers: Vec<_> = modifiers.keys().copied().copied().collect();
let allocator = ctx.allocator();
let bo = allocator.create_bo(
&state.dma_buf_ids,
@ -67,7 +73,7 @@ pub fn take_screenshot(
extents.height(),
XRGB8888,
&modifiers,
BO_USE_RENDERING,
usage,
)?;
let fb = ctx.clone().dmabuf_fb(bo.dmabuf())?;
fb.render_node(