Merge remote-tracking branch 'upstream/trunk' into barrier-with-queue-properties

Author: Wumpf

.config/nextest.toml

@@ -6,10 +6,6 @@ slow-timeout = { period = "45s", terminate-after = 2 }
 fail-fast = false
 retries = 0
 
-[profile.default-miri]
-# Miri is very very slow, so give it a much longer timeout.
-slow-timeout = { period = "120s", terminate-after = 4 }
-
 # Use two threads for tests with "2 threads" in their name
 [[profile.default.overrides]]
 filter = 'test(~2_threads) | test(~2 threads)'
@@ -51,3 +47,13 @@ threads-required = "num-test-threads"
 [[profile.default.overrides]]
 priority = 1
 filter = 'test(clear_texture) | test(clear_buffer_range_respected) | test(compile_fail) | test(test_api)'
+
+[profile.wasm]
+default-filter = "test([wasm])"
+slow-timeout = { period = "45s", terminate-after = 2 }
+fail-fast = false
+retries = 0
+
+[profile.default-miri]
+# Miri is very very slow, so give it a much longer timeout.
+slow-timeout = { period = "120s", terminate-after = 4 }

.deny.toml

@@ -1,85 +1,36 @@
+[graph]
+# This configuration is tuned for the published `wgpu`/`naga` library crates and
+# their dependencies *only* -- the skip/ignore/allow entries below assume that
+# scope. The binaries, tests, examples, and tooling in this workspace pull in many
+# more dependencies that would produce false-positive advisory/ban/license noise.
+exclude-unpublished = true
+# Dev dependencies are not relevant to the published library crates, so we ignore them.
+exclude-dev = true
+
 [bans]
 multiple-versions = "deny"
-skip-tree = [
-    { name = "rustc-hash", version = "1.1.0" },
-
-    # introduced by Deno, to be investigated
-    { name = "petgraph", version = "0.6.5" },
-
-    # Winit 0.30 uses an older objc2
-    { name = "objc2-foundation", version = "0.2" },
-
-    # glutin and tracy-client-sys use windows-sys 0.52, pulling older windows-targets
-    { name = "windows-targets", version = "0.52" },
-]
+skip-tree = [{ name = "rustc-hash", version = "1.1.0" }]
 skip = [
-    # the ecosystem is migrating from getrandom 0.3 to 0.4, so this captures many stragglers
-    { name = "getrandom", version = "0.3.4" },
-
-    # Deno uses an old version
-    { name = "bincode", version = "1.3.3" },
-    { name = "which", version = "6.0.3" },
-
-    # Winit uses an old version via calloop → rustix 0.38
-    { name = "linux-raw-sys", version = "0.4" },
-    { name = "rustix", version = "0.38" },
-    { name = "windows-sys", version = "0.59" },
-
-    # Winit uses an old version via android-activity
-    { name = "thiserror", version = "1" },
-    { name = "thiserror-impl", version = "1" },
-
-    # glutin uses an old version
-    { name = "windows-sys", version = "0.52" },
-
-    # getrandom 0.3 uses an old version
-    { name = "r-efi", version = "5" },
-
-    # winit uses this old version
-    { name = "redox_syscall", version = "0.4.1" },
-    # parking-lot uses this old version
-    { name = "redox_syscall", version = "0.5.18" },
-
-    # deno uses an old version
-    { name = "bit-vec", version = "0.8.0" },
-    { name = "bit-set", version = "0.8.0" },
-
-    # drm uses an older version via drm-sys, and a newer version via rustix
-    { name = "linux-raw-sys", version = "0.9.4" },
-
-    # getrandom -> wasip3 -> wit-bindgen uses an old version but
-    # getrandom -> wasip2 -> wit-bindgen uses a newer version
-    { name = "wit-bindgen", version = "0.51.0" },
-
-    # android-activity -> ndk -> jni-sys uses an old version but
-    # android-activity -> jni -> jni-sys uses a newer version
-    { name = "jni-sys", version = "0.3.1" },
-
-    # v8 -> bindgen -> itertools uses an old version
-    { name = "itertools", version = "0.13" },
-
-    # gpu-descriptor and petgraph use an old version
+    # naga -> petgraph uses an old version
     { name = "hashbrown", version = "0.15.5" },
-
     # Used by hashbrown 0.15.5
     { name = "foldhash", version = "0.1.5" },
+
+    # naga depends on hashbrown 0.16 directly, while naga -> indexmap pulls hashbrown 0.17
+    { name = "hashbrown", version = "0.16.1" },
+
+    # wgpu-hal -> drm -> drm-sys uses an older version, while wgpu-hal -> drm -> rustix uses a newer one
+    { name = "linux-raw-sys", version = "0.9.4" },
 ]
 wildcards = "deny"
 allow-wildcard-paths = true
 
 [advisories]
 ignore = [
     # `paste` crate is no longer maintained https://rustsec.org/advisories/RUSTSEC-2024-0436
-    # It's a dependency of `metal` (which is to be replaced with `objc2-metal`), and a
-    # transitive dependency of `deno`. https://github.com/gfx-rs/wgpu/issues/7873
+    # It's a transitive dependency of `wgpu-core` via `macro_rules_attribute`.
+    # https://github.com/gfx-rs/wgpu/issues/7873
     "RUSTSEC-2024-0436",
-    # `unic-*` crates are no longer maintained https://rustsec.org/advisories/RUSTSEC-2025-0100
-    # These are used via `deno`. https://github.com/gfx-rs/wgpu/issues/8393
-    "RUSTSEC-2025-0075",
-    "RUSTSEC-2025-0080",
-    "RUSTSEC-2025-0081",
-    "RUSTSEC-2025-0098",
-    "RUSTSEC-2025-0100",
     # `bincode` is no longer maintained https://rustsec.org/advisories/RUSTSEC-2025-0141
     # We only use it directly for tests and tools. It is also used indirectly via deno.
     "RUSTSEC-2025-0141",
@@ -88,27 +39,16 @@ ignore = [
 [licenses]
 allow = [
     "Apache-2.0",
-    "Apache-2.0 WITH LLVM-exception",
     "BSD-2-Clause",
     "BSD-3-Clause",
     "ISC",
-    "MPL-2.0",
     "MIT",
-    "MIT-0",
     "Unicode-3.0",
     "Zlib",
 ]
 private = { ignore = true }
 
 [sources]
-allow-git = [
-    # Waiting on releases; used in examples/tests only
-
-    # Pending a release for https://github.com/rust-cli/env_logger/commit/143fa647ab33ed3acc9f160dfa3cb075cc62b5a3
-    "https://github.com/rust-cli/env_logger",
-    # Pending merge/release for https://github.com/LukasKalbertodt/libtest-mimic/pull/58
-    "https://github.com/cwfitzgerald/libtest-mimic",
-]
 unknown-registry = "deny"
 unknown-git = "deny"
 required-git-spec = "rev"

.github/actions/install-dxc/action.yml

@@ -7,11 +7,12 @@ runs:
       run: |
         set -e
 
-        export DXC_RELEASE="v1.8.2505.1"
-        export DXC_FILENAME="dxc_2025_07_14.zip"
+        export DXC_RELEASE="v1.9.2602.24"
+        export DXC_FILENAME="dxc_2026_05_27.zip"
 
         curl.exe -L --retry 5 https://github.com/microsoft/DirectXShaderCompiler/releases/download/$DXC_RELEASE/$DXC_FILENAME -o dxc.zip
         7z.exe e dxc.zip -odxc bin/x64/{dxc.exe,dxcompiler.dll}
 
         # We need to use cygpath to convert PWD to a windows path as we're using bash.
-        cygpath --windows "$PWD/dxc" >> "$GITHUB_PATH"
+        echo "WGPU_DX12_COMPILER=$(cygpath --windows "$PWD/dxc/dxcompiler.dll")" >> "$GITHUB_ENV"
+        echo "DENO_WEBGPU_DX12_COMPILER=$(cygpath --windows "$PWD/dxc/dxcompiler.dll")" >> "$GITHUB_ENV"

.github/actions/install-mesa/action.yml

@@ -4,10 +4,10 @@ inputs:
   # Sourced from https://archive.mesa3d.org/. Bumping this requires
   # updating the mesa build in https://github.com/gfx-rs/ci-build and creating a new release.
   version:
-    default: "25.2.7"
+    default: "26.1.3"
   # Corresponds to https://github.com/gfx-rs/ci-build/releases
   ci-binary-build:
-    default: "build26"
+    default: "build29"
   target-dir:
     description: "The directory into which to install the Mesa libraries."
     default: "target/llvm-cov-target/debug"
@@ -33,10 +33,11 @@ runs:
         cat <<- EOF > icd.json
         {
           "ICD": {
-              "api_version": "1.1.255",
+              "api_version": "1.4.348",
+              "library_arch": "64",
               "library_path": "$PWD/mesa/lib/x86_64-linux-gnu/libvulkan_lvp.so"
           },
-          "file_format_version": "1.0.0"
+          "file_format_version": "1.0.1"
         }
         EOF
 

.github/workflows/ci.yml

@@ -14,6 +14,10 @@ on:
   merge_group:
 
 env:
+  #
+  # Keep in sync with cts.yml
+  #
+
   #
   # Dependency versioning
   #
@@ -27,12 +31,11 @@ env:
   CORE_MSRV: "1.87"
 
   #
-  # Environment variables
+  # Build and test configuration
   #
 
   CARGO_INCREMENTAL: false
   CARGO_TERM_COLOR: always
-  WGPU_DX12_COMPILER: dxc
   RUST_LOG: debug,wasm_bindgen_wasm_interpreter=warn,wasm_bindgen_cli_support=warn,walrus=warn,naga=info
   RUST_BACKTRACE: full
   PKG_CONFIG_ALLOW_CROSS: 1 # allow android to work
@@ -42,6 +45,13 @@ env:
   CACHE_SUFFIX: e # cache busting
   WGPU_CI: true
 
+  #
+  # Runtime configuration
+  #
+
+  LVP_POISON_MEMORY: true # to test memory init; see docs/testing.md
+  WGPU_DX12_COMPILER: dxc
+
 # Every time a PR is pushed to, cancel any previous jobs. This
 # makes us behave nicer to github and get faster turnaround times
 # on PRs that are pushed to multiple times in rapid succession.
@@ -178,6 +188,13 @@ jobs:
             tier: 2
             kind: web
 
+          - name: WebAssembly 64-bit
+            os: ubuntu-24.04
+            target: wasm64-unknown-unknown
+            kind: wgpu-only
+            tier: 3
+            extra-flags: -Zbuild-std=std,panic_abort
+
           - name: Emscripten
             os: ubuntu-24.04
             target: wasm32-unknown-emscripten
@@ -309,13 +326,15 @@ jobs:
 
           # check with no features
           cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-types --no-default-features
+          cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p naga-types --no-default-features
           cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p naga --no-default-features
           cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-hal --no-default-features
           cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu --no-default-features
 
           # Check with all compatible features
           cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-types --no-default-features --features strict_asserts,fragile-send-sync-non-atomic-wasm,serde,counters
-          cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p naga --no-default-features --features dot-out,spv-in,spv-out
+          cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p naga-types --no-default-features --features serialize,deserialize
+          cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p naga --no-default-features --features dot-out,spv-in,spv-out,glsl-out,msl-out,serialize,deserialize,wgsl-in,wgsl-out,hlsl-out
           cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-hal --no-default-features --features fragile-send-sync-non-atomic-wasm
           cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu --no-default-features --features serde
 
@@ -577,16 +596,25 @@ jobs:
           rustup override set ${{ env.REPO_MSRV }}
           cargo -V
 
-      - name: Install `wasm-pack`
+      - name: Get `wasm-bindgen` version
+        run: |
+          WASM_BINDGEN_VERSION=$(cargo metadata --format-version 1 --all-features | jq '.packages[] | select(.name == "wasm-bindgen") | .version' | tr -d '"')
+
+          echo $WASM_BINDGEN_VERSION
+
+          echo "WASM_BINDGEN_VERSION=$WASM_BINDGEN_VERSION" >> "$GITHUB_ENV"
+
+      - name: Install `wasm-bindgen`
+        run: cargo +stable install wasm-bindgen-cli --version=$WASM_BINDGEN_VERSION
+
+      - name: Install `cargo-nextest`
         uses: taiki-e/install-action@v2
         with:
-          tool: wasm-pack
+          tool: cargo-nextest
 
       - name: Execute tests
         run: |
-          cd wgpu
-
-          wasm-pack test --headless --chrome --no-default-features --features wgsl,webgl,web --workspace
+          cargo xtask test-wasm
 
   gpu-test:
     # runtime is normally 5-15 minutes
@@ -727,7 +755,7 @@ jobs:
           cargo --locked llvm-cov report --lcov --output-path lcov.info
 
       - name: Upload coverage report to Codecov
-        uses: codecov/codecov-action@v6
+        uses: codecov/codecov-action@v7
         if: steps.coverage.outcome == 'success'
         with:
           files: lcov.info
@@ -819,26 +847,22 @@ jobs:
       # NOTE: Keep this above the others, because this will fail if there are _any_ changes to
       # files, even ones this step doesn't modify.
       - name: "Format `**/*.{md,js,html,yml}` files"
-        uses: creyD/prettier_action@v4.6
-        with:
-          prettier_version: 3.8.1
-          prettier_options: --check --write .
-          dry: true
+        run: "npx --yes prettier@3.8.1 --check --write . && git diff --exit-code"
 
       - name: Run `cargo fmt`
         run: |
           cargo --locked fmt -- --check
 
-      - name: Install Taplo
-        uses: uncenter/setup-taplo@v2
+      - name: Install Tombi
+        uses: tombi-toml/setup-tombi@v1.2.0
         with:
-          version: "0.9.3"
+          version: "1.1.3"
 
-      - name: Run `taplo fmt`
-        run: taplo format --check --diff
+      - name: Format TOML files
+        run: tombi format --check --diff
 
       - name: Check for typos
-        uses: crate-ci/typos@v1.46.3
+        uses: crate-ci/typos@v1.47.2
 
   check-cts-runner:
     # runtime is normally 2 minutes

.github/workflows/cts.yml

@@ -14,13 +14,24 @@ on:
   merge_group:
 
 env:
+  #
+  # Keep in sync with ci.yml
+  #
+
   REPO_MSRV: "1.93"
   CARGO_INCREMENTAL: false
   CARGO_TERM_COLOR: always
   RUST_BACKTRACE: full
   RUSTFLAGS: -D warnings
   RUSTDOCFLAGS: -D warnings
 
+  #
+  # Runtime configuration
+  #
+
+  LVP_POISON_MEMORY: true # to test memory init; see docs/testing.md
+  # cts_runner uses dxc by default
+
 # Every time a PR is pushed to, cancel any previous jobs. This
 # makes us behave nicer to github and get faster turnaround times
 # on PRs that are pushed to multiple times in rapid succession.
@@ -172,7 +183,7 @@ jobs:
           cargo --locked llvm-cov report --lcov --output-path lcov.info
 
       - name: Upload coverage report to Codecov
-        uses: codecov/codecov-action@v6
+        uses: codecov/codecov-action@v7
         if: steps.coverage.outcome == 'success'
         with:
           files: lcov.info

.gitignore

@@ -41,9 +41,14 @@ wgpu/red.png
 
 # Cached GPU config
 .gpuconfig
+.wasmgpuconfig
 
 # Temporary clone location for wasm-bindgen mirroring
 wgpu/src/backend/webgpu/webgpu_sys/wasm_bindgen_clone_tmp
 
 # LLM-related
 .claude/settings.local.json
+
+# Wasm test generated files
+/tests/wasm/dist
+/tests/wasm/runner/node_modules