fix(core): validate dst_buffer isn't destroyed when resolving query…

… sets
gfx-rs · Nov 21, 2024 · c70f54c · c70f54c
1 parent 5ca92bf
commit c70f54c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -131,6 +131,7 @@ By @ErichDonGubler in [#6456](https://github.com/gfx-rs/wgpu/pull/6456), [#6148]
 - Lower `QUERY_SET_MAX_QUERIES` (and enforced limits) from 8192 to 4096 to match WebGPU spec. By @ErichDonGubler in [#6525](https://github.com/gfx-rs/wgpu/pull/6525).
 - Allow non-filterable float on texture bindings never used with samplers when using a derived bind group layout. By @ErichDonGubler in [#6531](https://github.com/gfx-rs/wgpu/pull/6531/).
 - Replace potentially unsound usage of `PreHashedMap` with `FastHashMap`. By @jamienicol in [#6541](https://github.com/gfx-rs/wgpu/pull/6541).
+- Reject destroyed buffers in query set resolution. By @ErichDonGubler in #????.
 
 #### Naga
 

diff --git a/wgpu-core/src/command/query.rs b/wgpu-core/src/command/query.rs
@@ -387,13 +387,14 @@ impl Global {
 
         dst_buffer.same_device_as(cmd_buf.as_ref())?;
 
+        let snatch_guard = dst_buffer.device.snatchable_lock.read();
+        dst_buffer.check_destroyed(&snatch_guard)?;
+
         let dst_pending = cmd_buf_data
             .trackers
             .buffers
             .set_single(&dst_buffer, hal::BufferUses::COPY_DST);
 
-        let snatch_guard = dst_buffer.device.snatchable_lock.read();
-
         let dst_barrier = dst_pending.map(|pending| pending.into_hal(&dst_buffer, &snatch_guard));
 
         dst_buffer