Merge branch 'trunk' into raw-window-metal

Author: madsmtm

.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/CODEOWNERS

@@ -1,10 +1,17 @@
 * @gfx-rs/wgpu
 
-/cts_runner/    @gfx-rs/deno @gfx-rs/wgpu
-/deno_webgpu/   @gfx-rs/deno @gfx-rs/wgpu
+/cts_runner/    @crowlkats @gfx-rs/wgpu
+/deno_webgpu/   @crowlkats @gfx-rs/wgpu
 /naga/          @gfx-rs/naga
 /naga-cli/      @gfx-rs/naga
 
+# Both wgpu and naga teams are owners of naga infrastructure so
+# either team can review changes to deps and docs.
+naga/Cargo.toml      @gfx-rs/wgpu @gfx-rs/naga
+naga/README.md       @gfx-rs/wgpu @gfx-rs/naga
+naga/CHANGELOG.md    @gfx-rs/wgpu @gfx-rs/naga
+naga-cli/Cargo.toml  @gfx-rs/wgpu @gfx-rs/naga
+
 # We leave the codeowners empty for the changelog, so naga changes 
 # don't trigger wgpu reviews and vise versa.
 /CHANGELOG.md 

.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

@@ -13,21 +13,23 @@ env:
   #
 
   # Sourced from https://vulkan.lunarg.com/sdk/home#linux
-  VULKAN_SDK_VERSION: "1.3.268"
+  #
+  # We don't include the 4th version number, as it's not used in any URL.
+  VULKAN_SDK_VERSION: "1.3.290"
   # Sourced from https://www.nuget.org/packages/Microsoft.Direct3D.WARP
-  WARP_VERSION: "1.0.8"
+  WARP_VERSION: "1.0.13"
 
   # Sourced from https://github.com/microsoft/DirectXShaderCompiler/releases
   #
   # Must also be changed in shaders.yaml
-  DXC_RELEASE: "v1.7.2308"
-  DXC_FILENAME: "dxc_2023_08_14.zip"
+  DXC_RELEASE: "v1.8.2407"
+  DXC_FILENAME: "dxc_2024_07_31_clang_cl.zip"
 
   # 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.
-  MESA_VERSION: "23.3.1"
+  MESA_VERSION: "24.2.3"
   # Corresponds to https://github.com/gfx-rs/ci-build/releases
-  CI_BINARY_BUILD: "build18"
+  CI_BINARY_BUILD: "build19"
 
   # We sometimes need nightly to use special things in CI.
   #
@@ -311,7 +313,6 @@ jobs:
           rustup override set ${{ env.CORE_MSRV }}
           cargo -V
 
-      # Use special toolchain for rustdoc, see https://github.com/gfx-rs/wgpu/issues/4905
       - name: Install Nightly Toolchain
         run: |
           rustup toolchain install ${{ env.NIGHTLY_VERSION }} --no-self-update --profile=minimal --component clippy
@@ -442,7 +443,7 @@ jobs:
           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/amd64/d3d10warp.dll
+          7z.exe e warp.zip -owarp build/native/bin/x64/d3d10warp.dll
 
           mkdir -p target/llvm-cov-target/debug/deps
 
@@ -554,7 +555,7 @@ jobs:
           cargo llvm-cov report --lcov --output-path lcov.info
 
       - name: upload coverage report to codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         if: steps.coverage.outcome == 'success'
         with:
           files: lcov.info
@@ -613,13 +614,22 @@ jobs:
           rustup override set ${{ env.REPO_MSRV }}
           cargo -V
 
-      - name: run rustfmt
+      - name: Run `cargo fmt`
         run: |
           cargo fmt -- --check
           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/typos@v1.24.5
+        uses: crate-ci/typos@v1.27.3
 
   check-cts-runner:
     # runtime is normally 2 minutes

.github/workflows/docs.yml

@@ -41,7 +41,7 @@ jobs:
         if: ${{ failure() }}
 
       - name: Deploy the docs
-        uses: JamesIves/github-pages-deploy-action@v4.6.4
+        uses: JamesIves/github-pages-deploy-action@v4.6.9
         if: github.ref == 'refs/heads/trunk'
         with:
           token: ${{ secrets.WEB_DEPLOY }}

.github/workflows/publish.yml

@@ -41,7 +41,7 @@ jobs:
         run: cargo xtask run-wasm --no-serve
 
       - name: Deploy WebGPU examples
-        uses: JamesIves/github-pages-deploy-action@v4.6.4
+        uses: JamesIves/github-pages-deploy-action@v4.6.9
         if: github.ref == 'refs/heads/trunk'
         with:
           token: ${{ secrets.WEB_DEPLOY }}

.github/workflows/shaders.yml

@@ -9,13 +9,17 @@ on:
 
 env:
   # Sourced from https://vulkan.lunarg.com/sdk/home#linux
-  VULKAN_SDK_VERSION: "1.3.268"
+  #
+  # We don't include the 4th version number, as it's not used in any URL.
+  #
+  # Held back from 1.3.290 by https://github.com/gfx-rs/wgpu/issues/6307
+  VULKAN_SDK_VERSION: "1.3.283"
 
   # Sourced from https://github.com/microsoft/DirectXShaderCompiler/releases
   #
   # Must also be changed in ci.yaml
-  DXC_RELEASE: "v1.7.2308"
-  DXC_FILENAME: "dxc_2023_08_14.zip"
+  DXC_RELEASE: "v1.8.2407"
+  DXC_FILENAME: "dxc_2024_07_31_clang_cl.zip"
 
 jobs:
   naga-validate-windows: