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

commit_timeline: simplify some code

Browse source
This commit is contained in:
Julian Orth 2024-09-10 11:24:41 +02:00
parent 5d5843df9a
commit c22af6efb7
1 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -152,10 +152,10 @@ impl CommitTimeline {
pending: &mut Box<PendingState>, pending: &mut Box<PendingState>,
) -> Result<(), CommitTimelineError> { ) -> Result<(), CommitTimelineError> {
let mut points = SmallVec::new(); let mut points = SmallVec::new();
consume_acquire_points(pending, &mut points);
let mut pending_uploads = 0; let mut pending_uploads = 0;
count_shm_uploads(pending, &mut pending_uploads); collect_commit_data(pending, &mut points, &mut pending_uploads);
if points.is_empty() && pending_uploads == 0 && self.own_timeline.entries.is_empty() { let has_dependencies = points.is_not_empty() || pending_uploads > 0;
if !has_dependencies && self.own_timeline.entries.is_empty() {
return surface return surface
.apply_state(pending) .apply_state(pending)
.map_err(CommitTimelineError::ImmediateCommit); .map_err(CommitTimelineError::ImmediateCommit);
@ -177,7 +177,7 @@ impl CommitTimeline {
}), }),
); );
let mut needs_flush = false; let mut needs_flush = false;
if points.is_not_empty() || pending_uploads > 0 { if has_dependencies {
let noderef = Rc::new(noderef.clone()); let noderef = Rc::new(noderef.clone());
let EntryKind::Commit(commit) = &noderef.kind else { let EntryKind::Commit(commit) = &noderef.kind else {
unreachable!(); unreachable!();
@ -413,13 +413,22 @@ fn schedule_async_upload(
type Point = (Rc<SyncObj>, SyncObjPoint); type Point = (Rc<SyncObj>, SyncObjPoint);
fn consume_acquire_points(pending: &mut PendingState, points: &mut SmallVec<[Point; 1]>) { fn collect_commit_data(
pending: &mut PendingState,
acquire_points: &mut SmallVec<[Point; 1]>,
shm_uploads: &mut usize,
) {
if let Some(Some(buffer)) = &pending.buffer {
if buffer.is_shm() {
*shm_uploads += 1;
}
}
if let Some(point) = pending.acquire_point.take() { if let Some(point) = pending.acquire_point.take() {
points.push(point); acquire_points.push(point);
} }
for ss in pending.subsurfaces.values_mut() { for ss in pending.subsurfaces.values_mut() {
if let Some(state) = &mut ss.pending.state { if let Some(state) = &mut ss.pending.state {
consume_acquire_points(state, points); collect_commit_data(state, acquire_points, shm_uploads);
} }
} }
} }
@ -446,16 +455,3 @@ fn set_effective_timeline(
} }
} }
} }
fn count_shm_uploads(pending: &PendingState, count: &mut usize) {
if let Some(Some(buffer)) = &pending.buffer {
if buffer.is_shm() {
*count += 1;
}
}
for ss in pending.subsurfaces.values() {
if let Some(state) = &ss.pending.state {
count_shm_uploads(state, count);
}
}
}