Merge branch 'trunk' into msl-writer-less-pub

Author: Wumpf

.deny.toml

@@ -11,23 +11,15 @@ skip-tree = [
 
     # glutin and tracy-client-sys use windows-sys 0.52, pulling older windows-targets
     { name = "windows-targets", version = "0.52" },
-
-    # winit uses an old version via android-activity → jni
-    { name = "windows-targets", version = "0.42" },
 ]
 skip = [
-    # flume -> fastrand uses an old version only on wasm32
-    { name = "getrandom", version = "0.2.17" },
     # 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 android-activity → jni
-    { name = "windows-sys", version = "0.45" },
-
     # Winit uses an old version via calloop → rustix 0.38
     { name = "linux-raw-sys", version = "0.4" },
     { name = "rustix", version = "0.38" },
@@ -43,7 +35,9 @@ skip = [
     # getrandom 0.3 uses an old version
     { name = "r-efi", version = "5" },
 
-    # parking-lot uses an old version
+    # 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
@@ -52,6 +46,20 @@ skip = [
 
     # 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
+    { name = "hashbrown", version = "0.15.5" },
 ]
 wildcards = "deny"
 allow-wildcard-paths = true

.github/pull_request_template.md

@@ -29,9 +29,13 @@ 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 --tests`. If applicable, add:
-  - [ ] `--target wasm32-unknown-unknown`
-- [ ] Run `cargo xtask test` to run tests.
-- [ ] If this contains user-facing changes, add a `CHANGELOG.md` entry. <!-- See instructions at the top of `CHANGELOG.md`. -->
+<!-- Note that checking all the boxes is not necessary to open a PR. -->
+
+- [ ] I self-reviewed and fully understand this PR.
+- [ ] WebGPU implementations built with `wgpu` may be affected behaviorally.
+- [ ] Validation and feature gates are in place to confine behavioral changes.
+- [ ] Tests demonstrate the validation and altered logic works. <!-- See `docs/testing.md` -->
+- [ ] `CHANGELOG.md` entries for the user-facing effects of this change are present. <!-- See instructions at the top of `CHANGELOG.md`. -->
+- [ ] The PR is minimal, and doesn't make sense to land as multiple PRs.
+- [ ] Commits are logically scoped and individually reviewable.
+- [ ] The PR description has enough context to understand the motivation and solution implemented.

.github/workflows/ci.yml

@@ -244,6 +244,7 @@ jobs:
         uses: Swatinem/rust-cache@v2
         with:
           key: clippy-${{ matrix.target }}-${{ matrix.kind }}-${{ env.CACHE_SUFFIX }}
+          save-if: ${{ github.ref == 'refs/heads/trunk' }}
 
       - name: (Linux `aarch64`) Install `aarch64-linux-gnu` `g++`
         if: matrix.target == 'aarch64-unknown-linux-gnu'
@@ -334,6 +335,13 @@ jobs:
           # If we don't check this then errors inside `profiling::scope!()` will not be caught.
           cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} --tests --benches --all-features --features test-build-with-profiling
 
+          # Check wgpu-hal with main backends in isolation to catch missing feature/dependencies activations which may be overlooked when they are dragged in via other features.
+          # (best effort: in theory we'd need to test all combinations)
+          cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-hal --no-default-features --features vulkan
+          cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-hal --no-default-features --features gles
+          cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-hal --no-default-features --features metal
+          cargo --locked clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-hal --no-default-features --features dx12
+
           # build docs
           cargo --locked doc --target ${{ matrix.target }} ${{ matrix.extra-flags }} --all-features --no-deps
 
@@ -409,6 +417,7 @@ jobs:
         uses: Swatinem/rust-cache@v2
         with:
           key: wgpu-msrv-check-${{ matrix.target }}-${{ env.CACHE_SUFFIX }}
+          save-if: ${{ github.ref == 'refs/heads/trunk' }}
 
       - name: Reduce MSRV on dependencies
         shell: bash
@@ -481,6 +490,7 @@ jobs:
         uses: Swatinem/rust-cache@v2
         with:
           key: core-msrv-check-${{ matrix.target }}-${{ env.CACHE_SUFFIX }}
+          save-if: ${{ github.ref == 'refs/heads/trunk' }}
 
       - name: Reduce MSRV on dependencies
         shell: bash
@@ -628,6 +638,7 @@ jobs:
         uses: Swatinem/rust-cache@v2
         with:
           key: test-${{ matrix.os }}-${{ env.CACHE_SUFFIX }}
+          save-if: ${{ github.ref == 'refs/heads/trunk' }}
           workspaces: |
             . -> target
 
@@ -739,6 +750,7 @@ jobs:
         uses: Swatinem/rust-cache@v2
         with:
           key: doctests-${{ env.CACHE_SUFFIX }}
+          save-if: ${{ github.ref == 'refs/heads/trunk' }}
 
       - name: Run doctests
         shell: bash
@@ -770,6 +782,7 @@ jobs:
         uses: Swatinem/rust-cache@v2
         with:
           key: miri-${{ env.CACHE_SUFFIX }}
+          save-if: ${{ github.ref == 'refs/heads/trunk' }}
 
       - name: Run Miri on selected tests
         shell: bash
@@ -811,15 +824,15 @@ jobs:
           cargo --locked fmt -- --check
 
       - name: Install Taplo
-        uses: uncenter/setup-taplo@v1
+        uses: uncenter/setup-taplo@v2
         with:
           version: "0.9.3"
 
       - name: Run `taplo fmt`
         run: taplo format --check --diff
 
       - name: Check for typos
-        uses: crate-ci/typos@v1.45.0
+        uses: crate-ci/typos@v1.45.1
 
   check-cts-runner:
     # runtime is normally 2 minutes
@@ -851,6 +864,7 @@ jobs:
         uses: Swatinem/rust-cache@v2
         with:
           key: cts-runner-${{ env.CACHE_SUFFIX }}
+          save-if: ${{ github.ref == 'refs/heads/trunk' }}
 
       - name: Build Deno
         run: |

.github/workflows/cts.yml

@@ -101,6 +101,9 @@ jobs:
           # The version number can be incremented for cache busting.
           prefix-key: v3-rust-${{ hashFiles('cts_runner/revision.txt') }}
           cache-directories: cts
+          # Save the cache from the `other` job because it also runs the cts_runner
+          # integration tests.
+          save-if: ${{ github.ref == 'refs/heads/trunk' && matrix.suite == 'other' }}
 
       # We enable line numbers for panics, but that's it
       - name: disable debug
@@ -112,12 +115,28 @@ jobs:
           debug = "line-tables-only"
           EOF
 
+      # Unlike regular `llvm-cov run`, which builds artifacts in `target/llvm-cov-target`,
+      # `llvm-cov show-env` uses the regular target directory for artifacts. Because of this,
+      # this job configures the `install-mesa` and `install-warp` actions with the regular
+      # target directory, not the `llvm-cov-target` directory.
+      #
+      # The `GITHUB_ENV` file is not subject to shell expansion, so we need to un-escape the
+      # `llvm-cov show-env` output.
+      - name: Set llvm-cov environment
+        shell: bash
+        run: |
+          cargo llvm-cov --no-cfg-coverage show-env | while read -r assignment; do
+            key="${assignment%%=*}"
+            eval "$assignment"
+            echo "$key=${!key}" >> "$GITHUB_ENV"
+          done
+
       - name: (Windows) Install DXC
         if: matrix.os == 'windows-2022'
         uses: ./.github/actions/install-dxc
 
       # Note: `target-dir` is intentionally different from other jobs.
-      # See note in xtask about `llvm-cov show-env`.
+      # See note above about `llvm-cov show-env`.
       - name: (Windows) Install WARP
         if: matrix.os == 'windows-2022'
         uses: ./.github/actions/install-warp
@@ -138,7 +157,7 @@ jobs:
         run: |
           export LLVM_PROFILE_FILE=${{ github.workspace }}/target/wgpu-%p-%m.profraw
           export DENO_WEBGPU_BACKEND=${{ matrix.backend }}
-          cargo --locked llvm-cov --no-cfg-coverage --no-report test -p cts_runner
+          cargo --locked test -p cts_runner
 
       - name: Run CTS
         shell: bash
@@ -150,7 +169,6 @@ jobs:
         run: |
           set -e
 
-          source <(cargo llvm-cov --no-cfg-coverage show-env --sh)
           cargo --locked llvm-cov report --lcov --output-path lcov.info
 
       - name: Upload coverage report to Codecov

.github/workflows/docs.yml

@@ -57,6 +57,7 @@ jobs:
         uses: Swatinem/rust-cache@v2
         with:
           key: doc-build
+          save-if: ${{ github.ref == 'refs/heads/trunk' }}
 
       - name: Build the docs
         run: |

.github/workflows/generate.yml

@@ -72,6 +72,7 @@ jobs:
         uses: Swatinem/rust-cache@v2
         with:
           key: cargo-generate-${{ matrix.name }}
+          save-if: ${{ github.ref == 'refs/heads/trunk' }}
 
       - name: Install `cargo-generate`
         uses: taiki-e/install-action@v2

.github/workflows/publish.yml

@@ -62,6 +62,7 @@ jobs:
         uses: Swatinem/rust-cache@v2
         with:
           key: publish-build
+          save-if: ${{ github.ref == 'refs/heads/trunk' }}
 
       - name: Build examples
         run: cargo xtask run-wasm --no-serve

.github/workflows/shaders.yml

@@ -38,6 +38,8 @@ jobs:
           EOF
 
       - uses: Swatinem/rust-cache@v2
+        with:
+          save-if: ${{ github.ref == 'refs/heads/trunk' }}
 
       # We must have the FXC job before the DXC job, so the DXC PATH has priority
       # over the FXC PATH. This is because the windows kits also include an older
@@ -82,6 +84,8 @@ jobs:
           EOF
 
       - uses: Swatinem/rust-cache@v2
+        with:
+          save-if: ${{ github.ref == 'refs/heads/trunk' }}
 
       - run: |
           cd naga
@@ -110,6 +114,8 @@ jobs:
           EOF
 
       - uses: Swatinem/rust-cache@v2
+        with:
+          save-if: ${{ github.ref == 'refs/heads/trunk' }}
 
       - run: cd naga; cargo xtask validate spv