From 90dd7435e968776e8b3e3dbb7667ad13df5c729e Mon Sep 17 00:00:00 2001 From: Andy Leiserson Date: Fri, 17 Apr 2026 15:00:29 -0700 Subject: [PATCH] fix(core): Don't overlap QUEUE_PENDING_WRITES and QUEUE_LIFE_TRACKER locks --- wgpu-core/src/device/queue.rs | 13 ++++++------ wgpu-core/src/resource.rs | 38 ++++++++++++++++++++++------------- 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/wgpu-core/src/device/queue.rs b/wgpu-core/src/device/queue.rs index 157d54e80..4d41081e8 100644 --- a/wgpu-core/src/device/queue.rs +++ b/wgpu-core/src/device/queue.rs @@ -220,7 +220,7 @@ impl Queue { }; self.submit_with_pending_writes( - &mut pending_writes, + pending_writes, Vec::new(), surface_textures, fence.as_mut(), @@ -1435,10 +1435,10 @@ impl Queue { } } - let mut pending_writes = self.pending_writes.lock(); + let pending_writes = self.pending_writes.lock(); if let Err(e) = self.submit_with_pending_writes( - &mut pending_writes, + pending_writes, active_executions, submit_surface_textures_owned, fence.as_mut(), @@ -1450,8 +1450,6 @@ impl Queue { drop(command_index_guard); - drop(pending_writes); - profiling::scope!("cleanup"); // This will schedule destruction of all resources that are no longer needed @@ -1497,7 +1495,7 @@ impl Queue { /// Advances `last_successful_submission_index` and registers the submission with the lifetime tracker. fn submit_with_pending_writes( &self, - pending_writes: &mut PendingWrites, + mut pending_writes: MutexGuard<'_, PendingWrites>, mut active_executions: Vec, mut surface_textures: FastHashMap<*const Texture, Arc>, fence: &mut dyn hal::DynFence, @@ -1578,6 +1576,9 @@ impl Queue { .last_successful_submission_index .fetch_max(submit_index, Ordering::SeqCst); } + + drop(pending_writes); + // this will register the new submission to the life time tracker self.lock_life() .track_submission(submit_index, active_executions); diff --git a/wgpu-core/src/resource.rs b/wgpu-core/src/resource.rs index 476a5f8d9..edd23fafa 100644 --- a/wgpu-core/src/resource.rs +++ b/wgpu-core/src/resource.rs @@ -1019,18 +1019,23 @@ impl Buffer { }) }; - if let Some(queue) = device.get_queue() { + let Some(queue) = device.get_queue() else { + return; + }; + + { let mut pending_writes = queue.pending_writes.lock(); if pending_writes.contains_buffer(self) { pending_writes.consume_temp(temp); - } else { - let mut life_lock = queue.lock_life(); - let last_submit_index = life_lock.get_buffer_latest_submission_index(self); - if let Some(last_submit_index) = last_submit_index { - life_lock.schedule_resource_destruction(temp, last_submit_index); - } + return; } } + + let mut life_lock = queue.lock_life(); + let last_submit_index = life_lock.get_buffer_latest_submission_index(self); + if let Some(last_submit_index) = last_submit_index { + life_lock.schedule_resource_destruction(temp, last_submit_index); + } } } @@ -1516,18 +1521,23 @@ impl Texture { }) }; - if let Some(queue) = device.get_queue() { + let Some(queue) = device.get_queue() else { + return; + }; + + { let mut pending_writes = queue.pending_writes.lock(); if pending_writes.contains_texture(self) { pending_writes.consume_temp(temp); - } else { - let mut life_lock = queue.lock_life(); - let last_submit_index = life_lock.get_texture_latest_submission_index(self); - if let Some(last_submit_index) = last_submit_index { - life_lock.schedule_resource_destruction(temp, last_submit_index); - } + return; } } + + let mut life_lock = queue.lock_life(); + let last_submit_index = life_lock.get_texture_latest_submission_index(self); + if let Some(last_submit_index) = last_submit_index { + life_lock.schedule_resource_destruction(temp, last_submit_index); + } } }