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

wl_surface: add jay_sync_file_surface extension

Browse source
This commit is contained in:
Julian Orth 2026-02-19 20:32:54 +01:00
parent 8841865572
commit c5d983843e
13 changed files with 424 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/ifs/wl_surface/commit_timeline.rs
View file

@ -203,18 +203,18 @@ impl CommitTimeline {
let mut collector = CommitDataCollector {
acquire_points: Default::default(),
shm_uploads: 0,
implicit_dmabufs: Default::default(),
acquire_files: Default::default(),
commit_time: Default::default(),
};
collector.collect(pending);
let points = collector.acquire_points;
let pending_uploads = collector.shm_uploads;
let implicit_dmabufs = collector.implicit_dmabufs;
let acquire_files = collector.acquire_files;
let commit_time = collector.commit_time;
let has_commit_time = commit_time > 0;
let has_dependencies = points.is_not_empty()
|| pending_uploads > 0
|| implicit_dmabufs.is_not_empty()
|| acquire_files.is_not_empty()
|| has_commit_time;
let must_be_queued = has_dependencies
|| self.own_timeline.entries.is_not_empty()
@ -242,7 +242,7 @@ impl CommitTimeline {
wait_handles: Cell::new(Default::default()),
pending_uploads: NumCell::new(pending_uploads),
shm_upload: RefCell::new(ShmUploadState::None),
num_pending_polls: NumCell::new(implicit_dmabufs.len()),
num_pending_polls: NumCell::new(acquire_files.len()),
pending_polls: Cell::new(Default::default()),
fifo_state: Cell::new(commit_fifo_state),
commit_times: RefCell::new(CommitTimesState::Ready),
@ -270,9 +270,9 @@ impl CommitTimeline {
*commit.shm_upload.borrow_mut() = ShmUploadState::Todo(noderef.clone());
needs_flush = true;
}
if implicit_dmabufs.is_not_empty() {
if acquire_files.is_not_empty() {
let mut pending_polls = SmallVec::new();
for fd in implicit_dmabufs {
for fd in acquire_files {
let handle = self
.shared
.ring
@ -692,7 +692,7 @@ type Point = (Rc<Syncobj>, SyncobjPoint);
struct CommitDataCollector {
acquire_points: SmallVec<[Point; 1]>,
shm_uploads: usize,
implicit_dmabufs: SmallVec<[Rc<OwnedFd>; 1]>,
acquire_files: SmallVec<[Rc<OwnedFd>; 1]>,
commit_time: u64,
}
@ -703,14 +703,18 @@ impl CommitDataCollector {
if buffer.is_shm() {
self.shm_uploads += 1;
}
if !pending.explicit_sync
if !pending.syncobj_sync
&& pending.sync_file_acquire.is_none()
&& let Some(dmabuf) = &buffer.client_dmabuf
{
for plane in &dmabuf.planes {
self.implicit_dmabufs.push(plane.fd.clone());
self.acquire_files.push(plane.fd.clone());
}
}
}
if let Some(Some(sf)) = pending.sync_file_acquire.take() {
self.acquire_files.push(sf.0);
}
if let Some(point) = pending.acquire_point.take() {
self.acquire_points.push(point);
}