Merge branch 'trunk' into per-vertex-hlsl-msl

Author: inner-daemons

.deny.toml

@@ -1,15 +1,19 @@
 [bans]
 multiple-versions = "deny"
 skip-tree = [
-    { name = "windows-sys", version = "0.45" },
-    { name = "winit", version = "0.29" },
     { 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" },
+
+    # 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
@@ -21,8 +25,30 @@ skip = [
     { 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" },
+    { 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" },
+
     # parking-lot uses an 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" },
 ]
 wildcards = "deny"
 allow-wildcard-paths = true
@@ -65,10 +91,10 @@ private = { ignore = true }
 allow-git = [
     # Waiting on releases; used in examples/tests only
 
-    # Pending a release for https://github.com/Xudong-Huang/generator-rs/pull/75
-    "https://github.com/Xudong-Huang/generator-rs",
-    # Pending a release for https://github.com/gfx-rs/rspirv
-    "https://github.com/gfx-rs/rspirv",
+    # 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"

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

@@ -0,0 +1,11 @@
+name: "Install Agility SDK"
+description: "Install the D3D12 Agility SDK and export its environment variables"
+runs:
+  using: "composite"
+  steps:
+    - shell: bash
+      run: |
+        set -e
+
+        cargo xtask install-agility-sdk >> "$GITHUB_ENV"
+        echo WGPU_DX12_AGILITY_SDK_REQUIRE=1 >> "$GITHUB_ENV"

.github/workflows/ci.yml

@@ -641,6 +641,10 @@ jobs:
         with:
           target-dir: "target/llvm-cov-target/debug"
 
+      - name: (Windows) Install Agility SDK
+        if: matrix.os == 'windows-2022'
+        uses: ./.github/actions/install-agility-sdk
+
       - name: (Windows) Install Mesa
         if: matrix.os == 'windows-2022'
         uses: ./.github/actions/install-mesa