Merge remote-tracking branch 'trunk/trunk' into new-get-vertex

Vecvec · Feb 24, 2025 · 5d5d587 · 5d5d587
2 parents 9755883 + 853d90e
commit 5d5d587
Show file tree

Hide file tree

Showing 408 changed files with 1,833 additions and 1,654 deletions.
diff --git a/.config/nextest.toml b/.config/nextest.toml
@@ -19,3 +19,13 @@ threads-required = 4
 [[profile.default.overrides]]
 filter = 'test(~8_threads) | test(~8 threads)'
 threads-required = 8
+
+#
+# Workarounds for flaky tests
+#
+
+# https://github.com/gfx-rs/wgpu/issues/7200
+[[profile.default.overrides]]
+filter = 'test(wgpu_test::image_atomics::image_32_atomics)'
+# platform = 'cfg(target_vendor = "apple")'
+retries = 1
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -739,7 +739,7 @@ jobs:
         run: taplo format --check --diff
 
       - name: Check for typos
-        uses: crate-ci/typos@v1.29.7
+        uses: crate-ci/typos@v1.29.9
 
   check-cts-runner:
     # runtime is normally 2 minutes

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -54,7 +54,7 @@ jobs:
           RUSTC_BOOTSTRAP: 1
 
       - name: Deploy the docs
-        uses: JamesIves/github-pages-deploy-action@v4.7.2
+        uses: JamesIves/github-pages-deploy-action@v4.7.3
         if: github.ref == 'refs/heads/trunk'
         with:
           token: ${{ secrets.WEB_DEPLOY }}

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -55,7 +55,7 @@ jobs:
         run: cargo xtask run-wasm --no-serve
 
       - name: Deploy WebGPU examples
-        uses: JamesIves/github-pages-deploy-action@v4.7.2
+        uses: JamesIves/github-pages-deploy-action@v4.7.3
         if: github.ref == 'refs/heads/trunk'
         with:
           token: ${{ secrets.WEB_DEPLOY }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -51,6 +51,12 @@ also allows more easily creating these structures inline.
 
 By @cwfitzgerald in [#7133](https://github.com/gfx-rs/wgpu/pull/7133)
 
+#### All Backends Now Have Features
+
+Previously, the `vulkan` and `gles` backends were non-optional on windows, linux, and android and there was no way to disable them. We have now figured out how to properly make them disablable! Additionally, if you turn on the `webgl` feature, you will only get the GLES backend on WebAssembly, it won't leak into native builds, like previously it might have.
+
+By @cwfitzgerald in [#7076](https://github.com/gfx-rs/wgpu/pull/7076).
+
 #### `device.poll` Api Reworked
 
 This release reworked the poll api significantly to allow polling to return errors when polling hits internal timeout limits.

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,6 +16,7 @@ members = [
     "player",
     "tests",
     "wgpu-core",
+    "wgpu-core/platform-deps/*",
     "wgpu-hal",
     "wgpu-info",
     "wgpu-macros",
@@ -35,6 +36,7 @@ default-members = [
     "player",
     "tests",
     "wgpu-core",
+    "wgpu-core/platform-deps/*",
     "wgpu-hal",
     "wgpu-info",
     "wgpu-macros",
@@ -74,7 +76,12 @@ wgpu-macros = { version = "24.0.0", path = "./wgpu-macros" }
 wgpu-test = { version = "24.0.0", path = "./tests" }
 wgpu-types = { version = "24.0.0", path = "./wgpu-types" }
 
-anyhow = { version = "1.0.95", default-features = false }
+wgpu-core-deps-windows-linux-android = { version = "24.0.0", path = "./wgpu-core/platform-deps/windows-linux-android" }
+wgpu-core-deps-apple = { version = "24.0.0", path = "./wgpu-core/platform-deps/apple" }
+wgpu-core-deps-wasm = { version = "24.0.0", path = "./wgpu-core/platform-deps/wasm" }
+wgpu-core-deps-emscripten = { version = "24.0.0", path = "./wgpu-core/platform-deps/emscripten" }
+
+anyhow = { version = "1.0.96", default-features = false }
 approx = "0.5"
 argh = "0.1.13"
 arrayvec = { version = "0.7.6", default-features = false }
@@ -98,7 +105,6 @@ env_logger = "0.11"
 fern = "0.7"
 flume = "0.11"
 futures-lite = "2"
-getrandom = "0.2"
 glam = "0.29"
 hashbrown = { version = "0.14.5", default-features = false, features = [
     "ahash",
@@ -138,7 +144,7 @@ ron = "0.8"
 # see discussion here (including with some other alternatives): https://github.com/gfx-rs/wgpu/issues/6999
 # (using default-features = false to support no-std build, avoiding any extra features that may require std::collections)
 rustc-hash = { version = "1", default-features = false }
-serde_json = "1.0.138"
+serde_json = "1.0.139"
 serde = { version = "1", default-features = false }
 smallvec = "1"
 static_assertions = "1.1.0"

diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ The following binaries:
 - `cts_runner` - WebGPU Conformance Test Suite runner using `deno_webgpu`.
 - `player` - standalone application for replaying the API traces.
 
-For an overview of all the components in the gfx-rs ecosystem, see [the big picture](./etc/big-picture.png).
+For an overview of all the components in the gfx-rs ecosystem, see [the big picture](./docs/big-picture.png).
 
 ## Getting Started
 
@@ -86,7 +86,7 @@ For high-level documentation on how to use these extensions, see the individual
 
 🧪EXPERIMENTAL🧪 APIs are subject to change and may allow undefined behavior if used incorrectly.
 
-- 🧪EXPERIMENTAL🧪 [Ray Tracing](./etc/specs/ray_tracing.md).
+- 🧪EXPERIMENTAL🧪 [Ray Tracing](./docs/api-specs/ray_tracing.md).
 
 ## Supported Platforms
 
@@ -263,4 +263,4 @@ wgpu uses the coordinate systems of D3D and Metal:
 
 | Render                                              | Texture                                               |
 | --------------------------------------------------- | ----------------------------------------------------- |
-| ![render_coordinates](./etc/render_coordinates.png) | ![texture_coordinates](./etc/texture_coordinates.png) |
+| ![render_coordinates](./docs/render_coordinates.png) | ![texture_coordinates](./docs/texture_coordinates.png) |
diff --git a/etc/specs/ray_tracing.md → docs/api-specs/ray_tracing.md b/etc/specs/ray_tracing.md → docs/api-specs/ray_tracing.md
diff --git a/etc/big-picture.png → docs/big-picture.png b/etc/big-picture.png → docs/big-picture.png
diff --git a/etc/big-picture.xml → docs/big-picture.xml b/etc/big-picture.xml → docs/big-picture.xml
diff --git a/RELEASE.md → docs/release-checklist.md b/RELEASE.md → docs/release-checklist.md
diff --git a/etc/render_coordinates.png → docs/render_coordinates.png b/etc/render_coordinates.png → docs/render_coordinates.png
diff --git a/REVIEW-CHECKLIST.md → docs/review-checklist.md b/REVIEW-CHECKLIST.md → docs/review-checklist.md
diff --git a/etc/texture_coordinates.png → docs/texture_coordinates.png b/etc/texture_coordinates.png → docs/texture_coordinates.png
diff --git a/examples/features/Cargo.toml b/examples/features/Cargo.toml
@@ -35,7 +35,6 @@ bytemuck.workspace = true
 cfg-if.workspace = true
 encase = { workspace = true, features = ["glam"] }
 flume.workspace = true
-getrandom.workspace = true
 glam = { workspace = true, features = ["bytemuck"] }
 ktx2.workspace = true
 log.workspace = true

diff --git a/examples/features/src/repeated_compute/mod.rs b/examples/features/src/repeated_compute/mod.rs
@@ -5,6 +5,8 @@
 //! hello-compute example does not such as mapping buffers
 //! and why use the async channels.
 
+use nanorand::Rng;
+
 const OVERFLOW: u32 = 0xffffffff;
 
 async fn run() {
@@ -13,7 +15,7 @@ async fn run() {
 
     for _ in 0..10 {
         for p in numbers.iter_mut() {
-            *p = generate_rand() as u32;
+            *p = nanorand::tls_rng().generate::<u16>() as u32;
         }
 
         compute(&mut numbers, &context).await;
@@ -29,12 +31,6 @@ async fn run() {
     }
 }
 
-fn generate_rand() -> u16 {
-    let mut bytes = [0u8; 2];
-    getrandom::getrandom(&mut bytes[..]).unwrap();
-    u16::from_le_bytes(bytes)
-}
-
 async fn compute(local_buffer: &mut [u32], context: &WgpuContext) {
     log::info!("Beginning GPU compute on data {local_buffer:?}.");
     // Local buffer contents -> GPU storage buffer