Merge branch 'trunk' into zero-init-multiplanar-textures

Author: inner-daemons

.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

@@ -4,6 +4,8 @@
 # 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"
@@ -19,9 +21,6 @@ skip = [
 
     # 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" },
-
-    # wgpu-hal -> ndk-sys -> jni-sys uses an old version, while jni-sys 0.4 re-exports it
-    { name = "jni-sys", version = "0.3.1" },
 ]
 wildcards = "deny"
 allow-wildcard-paths = true
@@ -50,10 +49,6 @@ allow = [
 private = { ignore = true }
 
 [sources]
-allow-git = [
-    # Pending a release for https://github.com/rust-cli/env_logger/commit/143fa647ab33ed3acc9f160dfa3cb075cc62b5a3
-    "https://github.com/rust-cli/env_logger",
-]
 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/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.
@@ -577,16 +587,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 +746,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
@@ -816,26 +835,20 @@ jobs:
           rustup override set ${{ env.REPO_MSRV }}
           cargo -V
 
-      # 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 .
 
       - 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.1.3
         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.47.2

.github/workflows/cts.yml

@@ -14,12 +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
+  DENO_WEBGPU_STRICT_COMPLIANCE: 1
+
+  #
+  # 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
@@ -172,7 +184,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