diff --git a/tests/tests/wgpu-gpu/zero_init.rs b/tests/tests/wgpu-gpu/zero_init.rs index f8d857f20..a97ac066b 100644 --- a/tests/tests/wgpu-gpu/zero_init.rs +++ b/tests/tests/wgpu-gpu/zero_init.rs @@ -2926,7 +2926,6 @@ async fn check_mark_externally_initialized_case(ctx: &TestingContex // by wgpu-core. unsafe { let hal_device = ctx.device.as_hal::().expect("adapter backend mismatch"); - let hal_texture = texture.as_hal::().expect("adapter backend mismatch"); let (staging_buffer, _allocated_size) = hal_device .create_buffer(&hal::BufferDescriptor { @@ -2947,6 +2946,7 @@ async fn check_mark_externally_initialized_case(ctx: &TestingContex hal_device.unmap_buffer(&staging_buffer); } + let hal_texture = texture.as_hal::().expect("adapter backend mismatch"); let mut encoder = ctx .device .create_command_encoder(&CommandEncoderDescriptor { label: None }); diff --git a/wgpu-core/src/lock/rank.rs b/wgpu-core/src/lock/rank.rs index e730a6d55..7d7b268ca 100644 --- a/wgpu-core/src/lock/rank.rs +++ b/wgpu-core/src/lock/rank.rs @@ -121,11 +121,13 @@ define_lock_ranks! { } rank DEVICE_SNATCHABLE_LOCK "Device::snatchable_lock" followed by { BUFFER_MAP_STATE, + COMMAND_BUFFER_DATA, DEVICE_COMMAND_INDICES, QUEUE_PENDING_WRITES, DEVICE_TRACKERS, QUEUE_LIFE_TRACKER, BLAS_COMPACTION_STATE, + COMMAND_ALLOCATOR_FREE_ENCODERS, BUFFER_BIND_GROUPS, BUFFER_INITIALIZATION_STATUS, BUFFER_POOL, diff --git a/wgpu-core/src/lock/ranked.rs b/wgpu-core/src/lock/ranked.rs index 978addcb1..b59a1de3a 100644 --- a/wgpu-core/src/lock/ranked.rs +++ b/wgpu-core/src/lock/ranked.rs @@ -334,9 +334,13 @@ impl<'a, T> RwLockReadGuard<'a, T> { // Equivalent to std::mem::forget, but preserves the information about the lock // rank. pub fn forget(this: Self) -> RankData { + // Skip `Drop` for both the actual lock guard (`this.inner`) and the + // rank-checking state guard (`this.saved`) + let saved = core::mem::ManuallyDrop::new(this.saved); core::mem::forget(this.inner); - this.saved.0 + // Return the `RankData` so the caller can pass it to `force_unlock_read`. + saved.0 } }