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

autocommit 2022-04-28 20:33:24 CEST

Browse source
This commit is contained in:
Julian Orth 2022-04-28 20:33:24 +02:00
parent 1242a6c1e1
commit ed0beb8ff5
10 changed files with 122 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/backends/metal/video.rs
View file

@ -7,13 +7,9 @@ use {
backends::metal::{DrmId, MetalBackend, MetalError},
edid::Descriptor,
format::{Format, XRGB8888},
ifs::{
wl_buffer::WlBufferStorage,
wp_presentation_feedback::{KIND_HW_COMPLETION, KIND_VSYNC},
},
ifs::wp_presentation_feedback::{KIND_HW_COMPLETION, KIND_VSYNC},
render::{Framebuffer, RenderContext, RenderResult, Texture},
state::State,
time::Time,
utils::{
asyncevent::AsyncEvent, bitflags::BitflagsExt, clonecell::CloneCell,
debug_fn::debug_fn, errorfmt::ErrorFmt, numcell::NumCell, oserror::OsError,
@ -37,7 +33,6 @@ use {
cell::{Cell, RefCell},
ffi::CString,
fmt::{Debug, Formatter},
ops::Deref,
rc::Rc,
},
uapi::c,
@ -199,64 +194,7 @@ impl MetalConnector {
fr.send_done();
let _ = fr.client.remove_obj(&*fr);
}
if !node.global.pending_captures.is_empty() {
let now = Time::now().unwrap();
let mut captures = vec![];
for capture in node.global.pending_captures.iter() {
captures.push(capture.deref().clone());
let wl_buffer = match capture.buffer.take() {
Some(b) => b,
_ => {
log::warn!("Capture frame is pending but has no buffer attached");
capture.send_failed();
continue;
}
};
if wl_buffer.destroyed() {
capture.send_failed();
continue;
}
let rect = capture.rect;
if let WlBufferStorage::Shm { mem, .. } = &wl_buffer.storage {
let res = mem.access(|mem| {
buffer.fb.copy_to_shm(
rect.x1(),
rect.y1(),
rect.width(),
rect.height(),
XRGB8888,
mem,
);
});
if let Err(e) = res {
capture.client.error(e);
}
// capture.send_flags(FLAGS_Y_INVERT);
} else {
let fb = match wl_buffer.famebuffer.get() {
Some(fb) => fb,
_ => {
log::warn!("Capture buffer has no framebuffer");
capture.send_failed();
continue;
}
};
fb.copy_texture(
&self.state,
&buffer.tex,
-capture.rect.x1(),
-capture.rect.y1(),
);
}
if capture.with_damage.get() {
capture.send_damage();
}
capture.send_ready(now.0.tv_sec as _, now.0.tv_nsec as _);
}
for capture in captures {
capture.output_link.take();
}
}
node.global.perform_screencopies(&buffer.fb, &buffer.tex);
}
let mut changes = self.master.change();
changes.change_object(plane.id, |c| {