Merge remote-tracking branch 'upstream/trunk' into metal-feature-detection-fix

Author: inner-daemons

.deny.toml

@@ -18,14 +18,6 @@ skip = [
 
     # Winit uses an old version
     { name = "windows-sys", version = "0.52.0" },
-
-    # Loom uses a new windows version
-    { name = "windows", version = "0.61.1" },
-    { name = "windows-core", version = "0.61.2" },
-    { name = "windows-implement", version = "0.60.0" },
-    { name = "windows-interface", version = "0.59.1" },
-    { name = "windows-result", version = "0.3.4" },
-    { name = "windows-strings", version = "0.4.2" },
 ]
 wildcards = "deny"
 allow-wildcard-paths = true
@@ -65,6 +57,9 @@ private = { ignore = true }
 allow-git = [
     # Waiting on releases; used in examples/tests only
     "https://github.com/gfx-rs/metal-rs.git"
+
+    # Pending a release for https://github.com/Xudong-Huang/generator-rs/pull/75
+    "https://github.com/Xudong-Huang/generator-rs",
 ]
 unknown-registry = "deny"
 unknown-git = "deny"

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

@@ -7,8 +7,8 @@ runs:
       run: |
         set -e
 
-        export DXC_RELEASE="v1.8.2502"
-        export DXC_FILENAME="dxc_2025_02_20.zip"
+        export DXC_RELEASE="v1.8.2505.1"
+        export DXC_FILENAME="dxc_2025_07_14.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}

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

@@ -1,15 +1,15 @@
-name: 'Install Mesa'
-description: 'Install Mesa'
+name: "Install Mesa"
+description: "Install Mesa"
 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: '24.3.4'
+    default: "25.2.7"
   # Corresponds to https://github.com/gfx-rs/ci-build/releases
   ci-binary-build:
-    default: 'build20'
+    default: "build26"
 runs:
-  using: 'composite'
+  using: "composite"
   steps:
     - name: (Linux) Install Mesa
       if: runner.os == 'Linux'

.github/actions/install-vulkan-sdk/action.yml

@@ -1,13 +1,13 @@
-name: 'Install Vulkan SDK'
-description: 'Install Vulkan SDK'
+name: "Install Vulkan SDK"
+description: "Install Vulkan SDK"
 inputs:
   # Sourced from https://vulkan.lunarg.com/sdk/home#linux
   version:
-    default: '1.4.321'
+    default: "1.4.328"
   full-version:
-    default: '1.4.321.0'
+    default: "1.4.328.1"
 runs:
-  using: 'composite'
+  using: "composite"
   steps:
     - name: (Linux) Install Vulkan SDK
       if: runner.os == 'Linux'
@@ -43,7 +43,6 @@ runs:
 
         echo "C:/VulkanSDK/${{ env.VULKAN_FULL_SDK_VERSION }}/Bin" >> "$GITHUB_PATH"
 
-
     - name: (Mac) Install Vulkan SDK
       if: runner.os == 'macOS'
       shell: bash

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

@@ -1,8 +1,8 @@
 name: "Install WARP"
 description: "Install WARP"
 inputs:
-  target-dirs:
-    description: "Space-separated list of directories into which to install the WARP DLL."
+  target-dir:
+    description: "The directory into which to install the WARP DLL."
     required: true
 runs:
   using: "composite"
@@ -11,15 +11,4 @@ runs:
       run: |
         set -e
 
-        export WARP_VERSION="1.0.13"
-
-        # Make sure dxc is in path.
-        dxc --version
-
-        curl.exe -L --retry 5 https://www.nuget.org/api/v2/package/Microsoft.Direct3D.WARP/$WARP_VERSION -o warp.zip
-        7z.exe e warp.zip -owarp build/native/bin/x64/d3d10warp.dll
-
-        for dir in ${{ inputs.target-dirs }}; do
-          mkdir -p "$dir"
-          cp -v warp/d3d10warp.dll "$dir"
-        done
+        cargo xtask install-warp --target-dir ${{ inputs.target-dir }}

.github/workflows/changelog.yml

@@ -0,0 +1,50 @@
+name: changelog
+
+on:
+  pull_request:
+    paths:
+      - ".github/workflows/changelog.yml"
+      - "CHANGELOG.md"
+      - "xtask/**/*"
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - labeled
+      - unlabeled
+
+env:
+  #
+  # Dependency versioning
+  #
+
+  # This is the MSRV used by `wgpu` itself and all surrounding infrastructure.
+  REPO_MSRV: "1.88"
+
+  #
+  # Environment variables
+  #
+
+  CARGO_INCREMENTAL: false
+  CARGO_TERM_COLOR: always
+  RUST_LOG: info
+  RUST_BACKTRACE: "1"
+  CACHE_SUFFIX: c # cache busting
+
+jobs:
+  changelog:
+    timeout-minutes: 2
+
+    name: Check changelog for errors
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      # NOTE: Keep label name(s) in sync. with `xtask`'s implementation.
+      - name: Run `cargo xtask changelog …`
+        run: |
+          cargo xtask changelog "origin/${{ github.event.pull_request.base.ref }}" ${{ contains(github.event.pull_request.labels.*.name, 'changelog: released entry changed') && '--allow-released-changes' || ''  }}

.github/workflows/ci.yml

@@ -194,7 +194,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Install toolchain (repo MSRV - tier 1 or 2)
         if: matrix.tier == 1 || matrix.tier == 2
@@ -336,11 +336,11 @@ jobs:
         run: |
           set -e
 
-          # wgpu_core package
           cargo --locked doc --target ${{ matrix.target }} ${{ matrix.extra-flags }} \
                 --package wgpu-core \
                 --package wgpu-hal \
                 --package naga \
+                --package wgpu \
                 --all-features --no-deps --document-private-items
 
   # We run minimal checks on the MSRV of the core crates, ensuring that
@@ -375,7 +375,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Install core MSRV toolchain
         run: |
@@ -432,7 +432,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Install toolchain
         run: |
@@ -473,7 +473,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Install repo MSRV toolchain
         run: |
@@ -519,7 +519,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Install repo MSRV toolchain
         run: |
@@ -558,7 +558,7 @@ jobs:
         if: matrix.os == 'windows-2022'
         uses: ./.github/actions/install-warp
         with:
-          target-dirs: "target/llvm-cov-target/debug target/llvm-cov-target/debug/deps"
+          target-dir: "target/llvm-cov-target/debug"
 
       - name: (Windows) Install Mesa
         if: matrix.os == 'windows-2022'
@@ -642,7 +642,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Install repo MSRV toolchain
         run: |
@@ -670,7 +670,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Install repo MSRV toolchain
         run: |
@@ -691,7 +691,7 @@ jobs:
         run: taplo format --check --diff
 
       - name: Check for typos
-        uses: crate-ci/typos@v1.38.1
+        uses: crate-ci/typos@v1.39.2
 
   check-cts-runner:
     # runtime is normally 2 minutes
@@ -701,7 +701,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Install MSRV toolchain
         run: |
@@ -739,7 +739,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Run `cargo deny check`
         uses: EmbarkStudios/cargo-deny-action@v2
@@ -757,7 +757,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Run `cargo deny check`
         uses: EmbarkStudios/cargo-deny-action@v2

.github/workflows/cts.yml

@@ -55,7 +55,7 @@ jobs:
 
     steps:
       - name: checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Install Repo MSRV toolchain
         run: |
@@ -71,7 +71,8 @@ jobs:
       - name: caching
         uses: Swatinem/rust-cache@v2
         with:
-          prefix-key: v2-rust # Increment version for cache busting
+          # The version number can be incremented for cache busting.
+          prefix-key: v2-rust-${{ hashFiles('cts_runner/revision.txt') }}
           cache-directories: cts
 
       # We enable line numbers for panics, but that's it
@@ -92,7 +93,7 @@ jobs:
         if: matrix.os == 'windows-2022'
         uses: ./.github/actions/install-warp
         with:
-          target-dirs: "target/llvm-cov-target/debug"
+          target-dir: "target/llvm-cov-target/debug"
 
       - name: (Linux) Install Mesa
         if: matrix.os == 'ubuntu-24.04'

.github/workflows/docs.yml

@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -61,7 +61,7 @@ jobs:
           RUSTC_BOOTSTRAP: 1
 
       - name: Deploy the docs
-        uses: JamesIves/github-pages-deploy-action@v4.7.3
+        uses: JamesIves/github-pages-deploy-action@v4.7.4
         if: github.ref == 'refs/heads/trunk'
         with:
           token: ${{ secrets.WEB_DEPLOY }}

.github/workflows/generate.yml

@@ -49,7 +49,7 @@ jobs:
     name: "${{ matrix.name }}"
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       # We can't rely on an override here, as that would only set
       # the toolchain for the current directory, not the newly generated project.