From 0d32f7e75604feeff976445576c234da377fa3df Mon Sep 17 00:00:00 2001 From: Andy Leiserson Date: Fri, 17 Apr 2026 15:00:29 -0700 Subject: [PATCH] fix(core): Order BUFFER_MAP_STATE lock after QUEUE_PENDING_WRITES --- wgpu-core/src/lock/rank.rs | 16 +++++++++++----- wgpu-core/src/resource.rs | 3 ++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/wgpu-core/src/lock/rank.rs b/wgpu-core/src/lock/rank.rs index 14bfd1023..ba5950057 100644 --- a/wgpu-core/src/lock/rank.rs +++ b/wgpu-core/src/lock/rank.rs @@ -136,11 +136,6 @@ define_lock_ranks! { // Uncomment this to see an interesting cycle. // COMMAND_BUFFER_DATA, } - rank BUFFER_MAP_STATE "Buffer::map_state" followed by { - QUEUE_PENDING_WRITES, - DEVICE_TRACE, - SHARED_TRACKER_INDEX_ALLOCATOR_INNER, - } rank DEVICE_FENCE "Device::fence" followed by { DEVICE_COMMAND_INDICES, QUEUE_LIFE_TRACKER, @@ -154,6 +149,10 @@ define_lock_ranks! { SHARED_TRACKER_INDEX_ALLOCATOR_INNER, } rank QUEUE_PENDING_WRITES "Queue::pending_writes" followed by { + BUFFER_MAP_STATE, + DEVICE_TRACKERS, + COMMAND_ALLOCATOR_FREE_ENCODERS, + BUFFER_INITIALIZATION_STATUS, TEXTURE_INITIALIZATION_STATUS, SHARED_TRACKER_INDEX_ALLOCATOR_INNER, } @@ -164,11 +163,18 @@ define_lock_ranks! { TEXTURE_CLEAR_MODE, } rank QUEUE_LIFE_TRACKER "Queue::life_tracker" followed by { + BUFFER_MAP_STATE, + BUFFER_INITIALIZATION_STATUS, + BUFFER_POOL, COMMAND_ALLOCATOR_FREE_ENCODERS, DEVICE_DEFERRED_DESTROY, DEVICE_TRACE, SHARED_TRACKER_INDEX_ALLOCATOR_INNER, } + rank BUFFER_MAP_STATE "Buffer::map_state" followed by { + DEVICE_TRACE, + SHARED_TRACKER_INDEX_ALLOCATOR_INNER, + } rank COMMAND_ALLOCATOR_FREE_ENCODERS "CommandAllocator::free_encoders" followed by { SHARED_TRACKER_INDEX_ALLOCATOR_INNER, } diff --git a/wgpu-core/src/resource.rs b/wgpu-core/src/resource.rs index edd23fafa..682c59b54 100644 --- a/wgpu-core/src/resource.rs +++ b/wgpu-core/src/resource.rs @@ -887,7 +887,8 @@ impl Buffer { let device = &self.device; let snatch_guard = device.snatchable_lock.read(); let raw_buf = self.try_raw(&snatch_guard)?; - match mem::replace(&mut *self.map_state.lock(), BufferMapState::Idle) { + let map_state = mem::replace(&mut *self.map_state.lock(), BufferMapState::Idle); + match map_state { BufferMapState::Init { staging_buffer } => { #[cfg(feature = "trace")] if let Some(ref mut trace) = *device.trace.lock() {