Merge main into ray tracing

.cargo/config.toml

@@ -1,10 +1,2 @@
 [alias]
-xtask = "run --manifest-path xtask/Cargo.toml"
-
-[build]
-rustflags = [
-"--cfg=web_sys_unstable_apis"
-]
-rustdocflags = [
-"--cfg=web_sys_unstable_apis"
-]
+xtask = "run --manifest-path xtask/Cargo.toml --"

.config/nextest.toml

@@ -3,7 +3,17 @@
 [profile.default]
 slow-timeout = { period = "45s", terminate-after = 2 }
 
-# Use two threads for tests with "2_threads" in their name
+# Use two threads for tests with "2 threads" in their name
 [[profile.default.overrides]]
-filter = 'test(~2_threads)'
+filter = 'test(~2_threads) | test(~2 threads)'
 threads-required = 2
+
+# Use four threads for tests with "4 threads" in their name
+[[profile.default.overrides]]
+filter = 'test(~4_threads) | test(~4 threads)'
+threads-required = 4
+
+# Use eight threads for tests with "8 threads" in their name
+[[profile.default.overrides]]
+filter = 'test(~8_threads) | test(~8 threads)'
+threads-required = 8

.deny.toml

@@ -1,12 +1,18 @@
 [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.27.5" },
+	{ name = "winit", version = "0.27" },
+	{ name = "winit", version = "0.29" },
 	{ name = "rustc_version", version = "0.2.3" },
+	{ name = "sourcemap", version = "7.1.1" },
 ]
 skip = [
 	{ name = "hlsl-snapshots", version = "0.1.0" },
+	# Strum uses an old version
+	{ name = "heck", version = "0.4.0" },
 ]
 wildcards = "deny"
 allow-wildcard-paths = true
@@ -19,6 +25,7 @@ allow = [
 	"BSD-3-Clause",
 	"CC0-1.0",
 	"ISC",
+	"MPL-2.0",
 	"MIT",
 	"MIT-0",
 	"Unicode-DFS-2016",

.envrc

@@ -0,0 +1 @@
+use nix

.gitattributes

@@ -1,2 +1,8 @@
+<<<<<<< HEAD
 *.mtl binary -diff
 *.obj binary -diff
+=======
+*.mtl binary
+*.obj binary
+wgpu/src/backend/webgpu/webgpu_sys/** linguist-generated=true
+>>>>>>> trunk

.github/dependabot.yml

@@ -7,7 +7,7 @@ updates:
       interval: weekly
     # This allows dependabot to update _all_ lockfile packages.
     #
-    # These will be grouped into the existing group update PRs, so shoudn't generate additional jobs.
+    # These will be grouped into the existing group update PRs, so shouldn't generate additional jobs.
     allow:
       # Allow both direct and indirect updates for all packages
       - dependency-type: "all"

.github/workflows/ci.yml

@@ -37,13 +37,13 @@ env:
   #
   # This needs to be newer to work around https://github.com/gfx-rs/wgpu/issues/4905.
   #
-  # Once 1.76 coes out, we can use that instead of nightly.
+  # Once this fix hits stable Rust, we can use that instead of nightly.
   DOCS_RUST_VERSION: "nightly-2023-12-17"
   # This is the MSRV used by `wgpu` itself and all surrounding infrastructure.
-  REPO_MSRV: "1.71"
+  REPO_MSRV: "1.76"
   # This is the MSRV used by the `wgpu-core`, `wgpu-hal`, and `wgpu-types` crates,
   # to ensure that they can be used with firefox.
-  CORE_MSRV: "1.70"
+  CORE_MSRV: "1.76"
 
   #
   # Environment variables
@@ -55,10 +55,11 @@ env:
   RUST_LOG: info
   RUST_BACKTRACE: full
   PKG_CONFIG_ALLOW_CROSS: 1 # allow android to work
-  RUSTFLAGS: --cfg=web_sys_unstable_apis -D warnings
-  RUSTDOCFLAGS: --cfg=web_sys_unstable_apis -D warnings
+  RUSTFLAGS: -D warnings
+  RUSTDOCFLAGS: -D warnings
   WASM_BINDGEN_TEST_TIMEOUT: 300 # 5 minutes
   CACHE_SUFFIX: c # cache busting
+  WGPU_TESTING: true
 
 # We distinguish the following kinds of builds:
 # - native: build for the same target as we compile on
@@ -78,6 +79,7 @@ jobs:
     # runtime is normally 2-8 minutes
     #
     # currently high due to documentation time problems on mac.
+    # https://github.com/rust-lang/rust/issues/114891
     timeout-minutes: 30
 
     strategy:
@@ -225,10 +227,24 @@ jobs:
           cargo clippy --target ${{ matrix.target }} --no-default-features
 
           # Check with all features.
-          cargo clippy --target ${{ matrix.target }} --tests --all-features
+          cargo clippy --target ${{ matrix.target }} --tests --benches --all-features
 
           # build docs
           cargo +${{ env.DOCS_RUST_VERSION }} doc --target ${{ matrix.target }} --all-features --no-deps
+      # wgpu-core docs are not feasible due to <https://github.com/gfx-rs/wgpu/issues/4905>
+      #
+      # - name: check private item docs
+      #   if: matrix.kind == 'native'
+      #   shell: bash
+      #   run: |
+      #     set -e
+      #
+      #     # wgpu_core package
+      #     cargo +${{ env.DOCS_RUST_VERSION }} doc --target ${{ matrix.target }} \
+      #           --package wgpu-core \
+      #           --package wgpu-hal \
+      #           --package naga \
+      #           --all-features --no-deps --document-private-items
 
   # We run minimal checks on the MSRV of the core crates, ensuring that
   # its dependency tree does not cause issues for firefox.
@@ -344,7 +360,7 @@ jobs:
   wasm-test:
     # runtime is normally 2 minutes
     timeout-minutes: 10
-    
+
     name: Test WebAssembly
     runs-on: ubuntu-latest
     needs: [check]
@@ -530,7 +546,8 @@ jobs:
           cargo xtask test --llvm-cov
 
       - name: check naga snapshots
-        run: git diff --exit-code -- naga/tests/out
+        # git diff doesn't check untracked files, we need to stage those then compare with HEAD.
+        run: git add . && git diff --exit-code HEAD naga/tests/out
 
       - uses: actions/upload-artifact@v4
         if: always() # We want artifacts even if the tests fail.
@@ -554,6 +571,7 @@ jobs:
         if: steps.coverage.outcome == 'success'
         with:
           files: lcov.info
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   doctest:
     # runtime is normally 2 minutes
@@ -614,7 +632,7 @@ jobs:
           cargo fmt --manifest-path xtask/Cargo.toml -- --check
 
       - name: Check for typos
-        uses: crate-ci/typos@v1.18.2
+        uses: crate-ci/typos@v1.23.6
 
   check-cts-runner:
     # runtime is normally 2 minutes
@@ -663,7 +681,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Run `cargo deny check`
-        uses: EmbarkStudios/cargo-deny-action@v1
+        uses: EmbarkStudios/cargo-deny-action@v2
         with:
           command: check advisories
           arguments: --all-features --workspace
@@ -672,15 +690,15 @@ jobs:
   cargo-deny-check-rest:
     # runtime is normally 1 minute
     timeout-minutes: 5
-    
+
     name: "cargo-deny"
     runs-on: ubuntu-latest
     steps:
       - name: checkout repo
         uses: actions/checkout@v4
 
       - name: Run `cargo deny check`
-        uses: EmbarkStudios/cargo-deny-action@v1
+        uses: EmbarkStudios/cargo-deny-action@v2
         with:
           command: check bans licenses sources
           arguments: --all-features --workspace

.github/workflows/docs.yml

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

.github/workflows/publish.yml

@@ -12,7 +12,7 @@ env:
   CARGO_INCREMENTAL: false
   CARGO_TERM_COLOR: always
   RUST_BACKTRACE: full
-  RUSTFLAGS: --cfg=web_sys_unstable_apis
+  RUSTFLAGS:
 
 jobs:
   publish:
@@ -41,7 +41,7 @@ jobs:
         run: cargo xtask run-wasm --no-serve
 
       - name: Deploy WebGPU examples
-        uses: JamesIves/github-pages-deploy-action@v4.5.0
+        uses: JamesIves/github-pages-deploy-action@v4.6.3
         if: github.ref == 'refs/heads/trunk'
         with:
           token: ${{ secrets.WEB_DEPLOY }}

.gitignore

@@ -19,6 +19,9 @@ target/
 # Output from capture example
 wgpu/red.png
 
+# Output from render_to_texture example
+**/please_don't_git_push_me.png
+
 # Output from invalid comparison tests
 **/*-actual.png
 **/*-difference.png
@@ -31,3 +34,6 @@ cts/
 
 # Cached GPU config
 .gpuconfig
+
+# Temporary clone location for wasm-bindgen mirroring
+wgpu/src/backend/webgpu/webgpu_sys/wasm_bindgen_clone_tmp