Merge remote-tracking branch 'refs/remotes/gfx-rs/trunk' into ray-tra…

…cing-new

# Conflicts:
#	wgpu-core/src/device/resource.rs
#	wgpu-core/src/hub.rs

.deny.toml

@@ -1,50 +1,48 @@
 [bans]
 multiple-versions = "deny"
 skip-tree = [
-	# We never enable loom in any of our dependencies but it causes dupes
-	{ name = "loom", version = "0.7.2" },
-	{ name = "windows-sys", version = "0.45" },
-	{ name = "winit", version = "0.29" },
-	{ name = "rustc_version", version = "0.2.3" },
-	{ name = "sourcemap", version = "7.1.1" },
-	{ name = "miniz_oxide", version = "0.7.4" },
+    # We never enable loom in any of our dependencies but it causes dupes
+    { name = "loom", version = "0.7.2" },
+    { name = "windows-sys", version = "0.45" },
+    { name = "winit", version = "0.29" },
+    { name = "rustc_version", version = "0.2.3" },
+    { name = "sourcemap", version = "7.1.1" },
+    { name = "miniz_oxide", version = "0.7.4" },
 ]
 skip = [
-	{ name = "hlsl-snapshots", version = "0.1.0" },
-	# Strum uses an old version
-	{ name = "heck", version = "0.4.0" },
+    { name = "hlsl-snapshots", version = "0.1.0" },
+    # Strum uses an old version
+    { name = "heck", version = "0.4.0" },
 ]
 wildcards = "deny"
 allow-wildcard-paths = true
 
 [licenses]
 allow = [
-	"Apache-2.0",
-	"Apache-2.0 WITH LLVM-exception",
-	"BSD-2-Clause",
-	"BSD-3-Clause",
-	"CC0-1.0",
-	"ISC",
-	"MPL-2.0",
-	"MIT",
-	"MIT-0",
-	"Unicode-DFS-2016",
-	"Zlib",
+    "Apache-2.0",
+    "Apache-2.0 WITH LLVM-exception",
+    "BSD-2-Clause",
+    "BSD-3-Clause",
+    "CC0-1.0",
+    "ISC",
+    "MPL-2.0",
+    "MIT",
+    "MIT-0",
+    "Unicode-DFS-2016",
+    "Zlib",
 ]
 
 [sources]
 allow-git = [
-	# Waiting on releases; used in examples only
-	"https://github.com/Razaekel/noise-rs",
-	
-	"https://github.com/grovesNL/glow",
-	"https://github.com/gfx-rs/metal-rs",
+    # Waiting on releases; used in examples only
+    "https://github.com/Razaekel/noise-rs",
+
+    "https://github.com/grovesNL/glow",
+    "https://github.com/gfx-rs/metal-rs",
 ]
 unknown-registry = "deny"
 unknown-git = "deny"
 required-git-spec = "rev"
 
 [sources.allow-org]
-github = [
-	"gfx-rs"
-]
+github = ["gfx-rs"]

.github/pull_request_template.md

@@ -7,7 +7,7 @@ _Describe what problem this is solving, and how it's solved._
 **Testing**
 _Explain how this change is tested._
 
-<!-- 
+<!--
 Thanks for filing! The codeowners file will automatically request reviews from the appropriate teams.
 
 After you get a review and have addressed any comments, please explicitly re-request a review from the
@@ -17,6 +17,7 @@ person(s) who reviewed your changes. This will make sure it gets re-added to the
 **Checklist**
 
 - [ ] Run `cargo fmt`.
+- [ ] Run `taplo format`.
 - [ ] Run `cargo clippy`. If applicable, add:
   - [ ] `--target wasm32-unknown-unknown`
   - [ ] `--target wasm32-unknown-emscripten`

.github/workflows/ci.yml

@@ -620,6 +620,14 @@ jobs:
           cargo fmt --manifest-path xtask/Cargo.toml -- --check
           cargo fmt --manifest-path naga/xtask/Cargo.toml -- --check
 
+      - name: Install Taplo
+        uses: uncenter/setup-taplo@v1
+        with:
+          version: "0.9.3"
+
+      - name: run `taplo fmt`
+        run: taplo format --check --diff
+
       - name: Check for typos
         uses: crate-ci/[email protected]
 

CHANGELOG.md

@@ -88,21 +88,29 @@ By @bradwerth [#6216](https://github.com/gfx-rs/wgpu/pull/6216).
 - Support for more atomic ops in the SPIR-V frontend. By @schell in [#5824](https://github.com/gfx-rs/wgpu/pull/5824).
 - Support local `const` declarations in WGSL. By @sagudev in [#6156](https://github.com/gfx-rs/wgpu/pull/6156).
 - Implemented `const_assert` in WGSL. By @sagudev in [#6198](https://github.com/gfx-rs/wgpu/pull/6198).
+- Support polyfilling `inverse` in WGSL. By @chyyran in [#6385](https://github.com/gfx-rs/wgpu/pull/6385).
+- Add an internal skeleton for parsing `requires`, `enable`, and `diagnostic` directives that don't yet do anything besides emit nicer errors. By @ErichDonGubler in [#6352](https://github.com/gfx-rs/wgpu/pull/6352).
 
 #### General
 
 - Add `VideoFrame` to `ExternalImageSource` enum. By @jprochazk in [#6170](https://github.com/gfx-rs/wgpu/pull/6170)
+- Add `wgpu::util::new_instance_with_webgpu_detection` & `wgpu::util::is_browser_webgpu_supported` to make it easier to support WebGPU & WebGL in the same binary. By @wumpf in [#6371](https://github.com/gfx-rs/wgpu/pull/6371)
 
 #### Vulkan
 
 - Allow using [VK_GOOGLE_display_timing](https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_GOOGLE_display_timing.html) unsafely with the `VULKAN_GOOGLE_DISPLAY_TIMING` feature. By @DJMcNab in [#6149](https://github.com/gfx-rs/wgpu/pull/6149)
 
+#### Metal
+
+- Implement `atomicCompareExchangeWeak`. By @AsherJingkongChen in [#6265](https://github.com/gfx-rs/wgpu/pull/6265)
+
 ### Bug Fixes
 
 - Fix incorrect hlsl image output type conversion. By @atlv24 in [#6123](https://github.com/gfx-rs/wgpu/pull/6123)
 
 #### Naga
 
+- SPIR-V frontend splats depth texture sample and load results. Fixes [issue #4551](https://github.com/gfx-rs/wgpu/issues/4551). By @schell in [#6384](https://github.com/gfx-rs/wgpu/pull/6384).
 - Accept only `vec3` (not `vecN`) for the `cross` built-in. By @ErichDonGubler in [#6171](https://github.com/gfx-rs/wgpu/pull/6171).
 - Configure `SourceLanguage` when enabling debug info in SPV-out. By @kvark in [#6256](https://github.com/gfx-rs/wgpu/pull/6256).
 - Per-polygon and flat inputs should not be considered subgroup uniform. By @magcius in [#6276](https://github.com/gfx-rs/wgpu/pull/6276).
@@ -111,6 +119,9 @@ By @bradwerth [#6216](https://github.com/gfx-rs/wgpu/pull/6216).
 - Fix type parameters to vec/mat type constructors to also support aliases. By @sagudev in [#6189](https://github.com/gfx-rs/wgpu/pull/6189).
 - Accept global `var`s without explicit type. By @sagudev in [#6199](https://github.com/gfx-rs/wgpu/pull/6199).
 - Fix handling of phony statements, so they are actually emitted. By @sagudev in [#6328](https://github.com/gfx-rs/wgpu/pull/6328).
+- Added `gl_DrawID` to glsl and `DrawIndex` to spv. By @ChosenName in [#6325](https://github.com/gfx-rs/wgpu/pull/6325).
+- Matrices can now be indexed by value (#4337), and indexing arrays by value no longer causes excessive spilling (#6358). By @jimblandy in [#6390](https://github.com/gfx-rs/wgpu/pull/6390).
+- Add support for `textureQueryLevels` to the GLSL parser. By @magcius in [#6325](https://github.com/gfx-rs/wgpu/pull/6415).
 
 #### General
 
@@ -126,6 +137,10 @@ By @bradwerth [#6216](https://github.com/gfx-rs/wgpu/pull/6216).
 - Document `wgpu_hal` bounds-checking promises, and adapt `wgpu_core`'s lazy initialization logic to the slightly weaker-than-expected guarantees. By @jimblandy in [#6201](https://github.com/gfx-rs/wgpu/pull/6201)
 - Raise validation error instead of panicking in `{Render,Compute}Pipeline::get_bind_group_layout` on native / WebGL. By @bgr360 in [#6280](https://github.com/gfx-rs/wgpu/pull/6280).
 - **BREAKING**: Remove the last exposed C symbols in project, located in `wgpu_core::render::bundle::bundle_ffi`, to allow multiple versions of WGPU to compile together. By @ErichDonGubler in [#6272](https://github.com/gfx-rs/wgpu/pull/6272).
+- Call `flush_mapped_ranges` when unmapping write-mapped buffers. By @teoxoy in [#6089](https://github.com/gfx-rs/wgpu/pull/6089).
+- When mapping buffers for reading, mark buffers as initialized only when they have `MAP_WRITE` usage. By @teoxoy in [#6178](https://github.com/gfx-rs/wgpu/pull/6178).
+- Add a separate pipeline constants error. By @teoxoy in [#6094](https://github.com/gfx-rs/wgpu/pull/6094).
+- Ensure safety of indirect dispatch by injecting a compute shader that validates the content of the indirect buffer. By @teoxoy in [#5714](https://github.com/gfx-rs/wgpu/pull/5714)
 
 #### GLES / OpenGL
 
@@ -146,6 +161,16 @@ By @bradwerth [#6216](https://github.com/gfx-rs/wgpu/pull/6216).
 - `wgpu_hal::gles::Adapter::new_external` now requires the context to be current when dropping the adapter and related objects. By @Imberflur in [#6114](https://github.com/gfx-rs/wgpu/pull/6114).
 - Reduce the amount of debug and trace logs emitted by wgpu-core and wgpu-hal. By @nical in [#6065](https://github.com/gfx-rs/wgpu/issues/6065)
 - `Rg11b10Float` is renamed to `Rg11b10Ufloat`. By @sagudev in [#6108](https://github.com/gfx-rs/wgpu/pull/6108)
+- Invalidate the device when we encounter driver-induced device loss or on unexpected errors. By @teoxoy in [#6229](https://github.com/gfx-rs/wgpu/pull/6229).
+- Make Vulkan error handling more robust. By @teoxoy in [#6119](https://github.com/gfx-rs/wgpu/pull/6119).
+
+#### Internal
+
+- Tracker simplifications. By @teoxoy in [#6073](https://github.com/gfx-rs/wgpu/pull/6073) & [#6088](https://github.com/gfx-rs/wgpu/pull/6088).
+- D3D12 cleanup. By @teoxoy in [#6200](https://github.com/gfx-rs/wgpu/pull/6200).
+- Use `ManuallyDrop` in remaining places. By @teoxoy in [#6092](https://github.com/gfx-rs/wgpu/pull/6092).
+- Move out invalidity from the `Registry`. By @teoxoy in [#6243](https://github.com/gfx-rs/wgpu/pull/6243).
+- Remove `backend` from ID. By @teoxoy in [#6263](https://github.com/gfx-rs/wgpu/pull/6263).
 
 #### HAL
 
@@ -167,6 +192,7 @@ By @bradwerth [#6216](https://github.com/gfx-rs/wgpu/pull/6216).
 #### DX12
 
 - Replace `winapi` code to use the `windows` crate. By @MarijnS95 in [#5956](https://github.com/gfx-rs/wgpu/pull/5956) and [#6173](https://github.com/gfx-rs/wgpu/pull/6173)
+- Get `num_workgroups` builtin working for indirect dispatches. By @teoxoy in [#5730](https://github.com/gfx-rs/wgpu/pull/5730)
 
 #### HAL
 

Cargo.toml

@@ -76,7 +76,7 @@ arrayvec = "0.7"
 bincode = "1"
 bit-vec = "0.8"
 bitflags = "2.6"
-bytemuck = { version = "1.18" }
+bytemuck = { version = "1.19" }
 cfg_aliases = "0.1"
 cfg-if = "1"
 criterion = "0.5"
@@ -153,7 +153,7 @@ windows-core = { version = "0.58", default-features = false }
 
 # Gles dependencies
 khronos-egl = "6"
-glow = "0.14.1"
+glow = "0.14.2"
 glutin = { version = "0.31", default-features = false }
 glutin-winit = { version = "0.4", default-features = false }
 glutin_wgl_sys = "0.6"
@@ -165,10 +165,10 @@ windows = { version = "0.58", default-features = false }
 console_error_panic_hook = "0.1.7"
 console_log = "1"
 js-sys = "0.3.70"
-wasm-bindgen = "0.2.87"
+wasm-bindgen = "0.2.95"
 wasm-bindgen-futures = "0.4.43"
 wasm-bindgen-test = "0.3"
-web-sys = "0.3.70"
+web-sys = "0.3.72"
 web-time = "0.2.4"
 
 # deno dependencies

cts_runner/Cargo.toml

@@ -1,9 +1,7 @@
 [package]
 name = "cts_runner"
 version = "0.1.0"
-authors = [
-	"Luca Casonato <[email protected]>"
-]
+authors = ["Luca Casonato <[email protected]>"]
 edition.workspace = true
 description = "CTS runner for wgpu"
 license.workspace = true

deno_webgpu/surface.rs

@@ -87,7 +87,6 @@ pub fn op_webgpu_surface_get_current_texture(
             let rid = state.resource_table.add(crate::texture::WebGpuTexture {
                 instance: instance.clone(),
                 id,
-                owned: false,
             });
             Ok(WebGpuResult::rid(rid))
         }