Release 25.0.2 (#7723)

Co-authored-by: David Lenaerts <[email protected]>
Co-authored-by: RedMindZ <[email protected]>
Co-authored-by: Kevin Reid <[email protected]>
fix(webgpu): Insert fragment constants into fragment descriptor instead of vertex (#7621) (#7722)
Fixed a deadlock caused by locking the device's snatchable lock **after** locking the queue's pending writes (#7582)
Fix `raw-window-handle` dependency being too lenient (#7526)

Author: 4 people

CHANGELOG.md

@@ -40,6 +40,19 @@ Bottom level categories:
 
 ## Unreleased
 
+## v25.0.2 (2025-05-24)
+
+### Bug Fixes
+
+#### General
+
+- Fix a possible deadlock within `Queue::write_buffer`. By @RedMindZ in [#7582](https://github.com/gfx-rs/wgpu/pull/7582)
+- Fix `raw-window-handle` dependency being too lenient. By @kpreid in [#7526](https://github.com/gfx-rs/wgpu/pull/7526)
+
+#### WebGPU
+
+- Insert fragment pipeline constants into fragment descriptor instead of vertex descriptor. By @DerSchmale in [#7621](https://github.com/gfx-rs/wgpu/pull/7621)
+
 ## v25.0.1 (2025-04-11)
 
 ### Bug Fixes
@@ -376,6 +389,16 @@ By @cwfitzgerald in [#6811](https://github.com/gfx-rs/wgpu/pull/6811), [#6815](h
 
 - Call `pre_present_notify()` before presenting. By @kjarosh in [#7074](https://github.com/gfx-rs/wgpu/pull/7074).
 
+## v24.0.5 (2025-05-24)
+
+### Bug Fixes
+
+#### General
+- Fix a possible deadlock within `Queue::write_buffer`. By @RedMindZ in [#7582](https://github.com/gfx-rs/wgpu/pull/7582)
+
+#### WebGPU
+- Insert fragment pipeline constants into fragment descriptor instead of vertex descriptor. By @DerSchmale in [#7621](https://github.com/gfx-rs/wgpu/pull/7621)
+
 ## v24.0.4 (2025-04-03)
 
 ### Metal

Cargo.lock

@@ -138,7 +138,7 @@ png = "0.17.16"
 pollster = "0.4"
 portable-atomic = "1"
 profiling = { version = "1", default-features = false }
-raw-window-handle = { version = "0.6", default-features = false }
+raw-window-handle = { version = "0.6.2", default-features = false }
 rayon = "1"
 renderdoc-sys = "1.1.0"
 ron = "0.9"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wgpu-core"
-version = "25.0.1"
+version = "25.0.2"
 authors = ["gfx-rs developers"]
 edition = "2021"
 description = "Core implementation logic of wgpu, the cross-platform, safe, pure-rust graphics API"

wgpu-core/Cargo.toml

@@ -476,6 +476,8 @@ impl Queue {
             return Ok(());
         };
 
+        let snatch_guard = self.device.snatchable_lock.read();
+
         // Platform validation requires that the staging buffer always be
         // freed, even if an error occurs. All paths from here must call
         // `device.pending_writes.consume`.
@@ -489,6 +491,7 @@ impl Queue {
         };
 
         let result = self.write_staging_buffer_impl(
+            &snatch_guard,
             &mut pending_writes,
             &staging_buffer,
             buffer,
@@ -522,6 +525,7 @@ impl Queue {
 
         let buffer = buffer.get()?;
 
+        let snatch_guard = self.device.snatchable_lock.read();
         let mut pending_writes = self.pending_writes.lock();
 
         // At this point, we have taken ownership of the staging_buffer from the
@@ -531,6 +535,7 @@ impl Queue {
         let staging_buffer = staging_buffer.flush();
 
         let result = self.write_staging_buffer_impl(
+            &snatch_guard,
             &mut pending_writes,
             &staging_buffer,
             buffer,
@@ -583,6 +588,7 @@ impl Queue {
 
     fn write_staging_buffer_impl(
         &self,
+        snatch_guard: &SnatchGuard,
         pending_writes: &mut PendingWrites,
         staging_buffer: &FlushedStagingBuffer,
         buffer: Arc<Buffer>,
@@ -595,8 +601,7 @@ impl Queue {
                 .set_single(&buffer, wgt::BufferUses::COPY_DST)
         };
 
-        let snatch_guard = self.device.snatchable_lock.read();
-        let dst_raw = buffer.try_raw(&snatch_guard)?;
+        let dst_raw = buffer.try_raw(snatch_guard)?;
 
         self.same_device_as(buffer.as_ref())?;
 
@@ -614,7 +619,7 @@ impl Queue {
                 to: wgt::BufferUses::COPY_SRC,
             },
         })
-        .chain(transition.map(|pending| pending.into_hal(&buffer, &snatch_guard)))
+        .chain(transition.map(|pending| pending.into_hal(&buffer, snatch_guard)))
         .collect::<Vec<_>>();
         let encoder = pending_writes.activate();
         unsafe {

wgpu-core/src/device/queue.rs

@@ -1,6 +1,6 @@
 [package]
 name = "wgpu-hal"
-version = "25.0.1"
+version = "25.0.2"
 authors = ["gfx-rs developers"]
 edition = "2021"
 description = "Hardware abstraction layer for wgpu, the cross-platform, safe, pure-rust graphics API"

wgpu-hal/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wgpu"
-version.workspace = true
+version = "25.0.2"
 authors.workspace = true
 edition.workspace = true
 description = "Cross-platform, safe, pure-rust graphics API"

wgpu/Cargo.toml

@@ -2130,7 +2130,7 @@ impl dispatch::DeviceInterface for WebDevice {
                 .collect::<js_sys::Array>();
             let module = frag.module.inner.as_webgpu();
             let mapped_fragment_desc = webgpu_sys::GpuFragmentState::new(&module.module, &targets);
-            insert_constants_map(&mapped_vertex_state, frag.compilation_options.constants);
+            insert_constants_map(&mapped_fragment_desc, frag.compilation_options.constants);
             if let Some(ep) = frag.entry_point {
                 mapped_fragment_desc.set_entry_point(ep);
             }