Bug 1848956 - Update wgpu to revision 57874e5c540330c8183e19ee87654…

…cf24bb5c250. r=webgpu-reviewers,glandium,supply-chain-reviewers,ErichDonGubler *** fixup Differential Revision: https://phabricator.services.mozilla.com/D186461
dothq · Aug 22, 2023 · a8d0e26 · a8d0e26
1 parent bb2ce44
commit a8d0e26
Show file tree

Hide file tree

Showing 42 changed files with 853 additions and 316 deletions.
diff --git a/.cargo/config.in b/.cargo/config.in
@@ -25,14 +25,14 @@ git = "https://github.com/franziskuskiefer/cose-rust"
 rev = "43c22248d136c8b38fe42ea709d08da6355cf04b"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/gfx-rs/naga?rev=bac2d82a430fbfcf100ee22b7c3bc12f3d593079"]
+[source."git+https://github.com/gfx-rs/naga?rev=7a19f3af909202c7eafd36633b5584bfbb353ecb"]
 git = "https://github.com/gfx-rs/naga"
-rev = "bac2d82a430fbfcf100ee22b7c3bc12f3d593079"
+rev = "7a19f3af909202c7eafd36633b5584bfbb353ecb"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/gfx-rs/wgpu?rev=7c6b85756237f77bfe8d6231dfc7a1412ff662b6"]
+[source."git+https://github.com/gfx-rs/wgpu?rev=57874e5c540330c8183e19ee87654cf24bb5c250"]
 git = "https://github.com/gfx-rs/wgpu"
-rev = "7c6b85756237f77bfe8d6231dfc7a1412ff662b6"
+rev = "57874e5c540330c8183e19ee87654cf24bb5c250"
 replace-with = "vendored-sources"
 
 [source."git+https://github.com/glandium/prost?rev=95964e9d33df3c2a9c3f14285e262867cab6f96b"]

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/build/rust/indexmap/Cargo.toml b/build/rust/indexmap/Cargo.toml
@@ -9,3 +9,7 @@ path = "lib.rs"
 
 [dependencies.indexmap]
 version = "1.9.3"
+
+[features]
+serde = ["indexmap/serde"]
+std = ["indexmap/std"]
diff --git a/gfx/wgpu_bindings/Cargo.toml b/gfx/wgpu_bindings/Cargo.toml
@@ -17,7 +17,7 @@ default = []
 [dependencies.wgc]
 package = "wgpu-core"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "7c6b85756237f77bfe8d6231dfc7a1412ff662b6"
+rev = "57874e5c540330c8183e19ee87654cf24bb5c250"
 #Note: "replay" shouldn't ideally be needed,
 # but it allows us to serialize everything across IPC.
 features = ["replay", "trace", "serial-pass", "strict_asserts", "wgsl"]
@@ -27,32 +27,32 @@ features = ["replay", "trace", "serial-pass", "strict_asserts", "wgsl"]
 [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies.wgc]
 package = "wgpu-core"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "7c6b85756237f77bfe8d6231dfc7a1412ff662b6"
+rev = "57874e5c540330c8183e19ee87654cf24bb5c250"
 features = ["metal"]
 
 # We want the wgpu-core Direct3D backends on Windows.
 [target.'cfg(windows)'.dependencies.wgc]
 package = "wgpu-core"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "7c6b85756237f77bfe8d6231dfc7a1412ff662b6"
+rev = "57874e5c540330c8183e19ee87654cf24bb5c250"
 features = ["dx11", "dx12"]
 
 # We want the wgpu-core Vulkan backend on Linux and Windows.
 [target.'cfg(any(windows, all(unix, not(any(target_os = "macos", target_os = "ios")))))'.dependencies.wgc]
 package = "wgpu-core"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "7c6b85756237f77bfe8d6231dfc7a1412ff662b6"
+rev = "57874e5c540330c8183e19ee87654cf24bb5c250"
 features = ["vulkan"]
 
 [dependencies.wgt]
 package = "wgpu-types"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "7c6b85756237f77bfe8d6231dfc7a1412ff662b6"
+rev = "57874e5c540330c8183e19ee87654cf24bb5c250"
 
 [dependencies.wgh]
 package = "wgpu-hal"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "7c6b85756237f77bfe8d6231dfc7a1412ff662b6"
+rev = "57874e5c540330c8183e19ee87654cf24bb5c250"
 
 [dependencies]
 bincode = "1"

diff --git a/gfx/wgpu_bindings/moz.yaml b/gfx/wgpu_bindings/moz.yaml
@@ -20,11 +20,11 @@ origin:
 
   # Human-readable identifier for this version/release
   # Generally "version NNN", "tag SSS", "bookmark SSS"
-  release: commit 7c6b85756237f77bfe8d6231dfc7a1412ff662b6
+  release: commit 57874e5c540330c8183e19ee87654cf24bb5c250
 
   # Revision to pull in
   # Must be a long or short commit SHA (long preferred)
-  revision: 7c6b85756237f77bfe8d6231dfc7a1412ff662b6
+  revision: 57874e5c540330c8183e19ee87654cf24bb5c250
 
   license: ['MIT', 'Apache-2.0']
 

diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
@@ -2262,6 +2262,11 @@ who = "Teodor Tanasoaia <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.12.0@git:b99d58ea435090e561377949f428bce2c18451bb -> 0.12.0@git:76003dc0035d53a474d366dcdf49d2e4d12e921f"
 
+[[audits.naga]]
+who = "Nicolas Silva <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.13.0@git:bac2d82a430fbfcf100ee22b7c3bc12f3d593079 -> 0.13.0@git:7a19f3af909202c7eafd36633b5584bfbb353ecb"
+
 [[audits.net2]]
 who = "Mike Hommey <[email protected]>"
 criteria = "safe-to-run"
@@ -3944,6 +3949,11 @@ who = "Erich Gubler <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.17.0@git:09b010b26af6876ce84991576a168a572172f08d -> 0.17.0@git:7c6b85756237f77bfe8d6231dfc7a1412ff662b6"
 
+[[audits.wgpu-core]]
+who = "Nicolas Silva <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.17.0@git:7c6b85756237f77bfe8d6231dfc7a1412ff662b6 -> 0.17.0@git:57874e5c540330c8183e19ee87654cf24bb5c250"
+
 [[audits.wgpu-hal]]
 who = "Dzmitry Malyshau <[email protected]>"
 criteria = "safe-to-deploy"
@@ -4047,6 +4057,11 @@ who = "Erich Gubler <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.17.0@git:09b010b26af6876ce84991576a168a572172f08d -> 0.17.0@git:7c6b85756237f77bfe8d6231dfc7a1412ff662b6"
 
+[[audits.wgpu-hal]]
+who = "Nicolas Silva <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.17.0@git:7c6b85756237f77bfe8d6231dfc7a1412ff662b6 -> 0.17.0@git:57874e5c540330c8183e19ee87654cf24bb5c250"
+
 [[audits.wgpu-types]]
 who = "Dzmitry Malyshau <[email protected]>"
 criteria = "safe-to-deploy"
@@ -4150,6 +4165,11 @@ who = "Erich Gubler <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.17.0@git:09b010b26af6876ce84991576a168a572172f08d -> 0.17.0@git:7c6b85756237f77bfe8d6231dfc7a1412ff662b6"
 
+[[audits.wgpu-types]]
+who = "Nicolas Silva <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.17.0@git:7c6b85756237f77bfe8d6231dfc7a1412ff662b6 -> 0.17.0@git:57874e5c540330c8183e19ee87654cf24bb5c250"
+
 [[audits.whatsys]]
 who = "Bobby Holley <[email protected]>"
 criteria = "safe-to-deploy"

diff --git a/third_party/rust/naga/.cargo-checksum.json b/third_party/rust/naga/.cargo-checksum.json
diff --git a/third_party/rust/naga/.github/workflows/ci.yml b/third_party/rust/naga/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ env:
   CARGO_INCREMENTAL: false
   CARGO_TERM_COLOR: always
   RUST_BACKTRACE: full
-  MSRV: 1.63
+  MSRV: 1.65
 
 jobs:
   check-msrv:
@@ -26,7 +26,7 @@ jobs:
           tool: cargo-hack
 
       # -Z avoid-dev-deps doesn't work
-      - run: cargo +nightly hack generate-lockfile --remove-dev-deps -Z minimal-versions --offline
+      - run: cargo +nightly hack generate-lockfile --remove-dev-deps -Z minimal-versions
 
       - name: Test all features
         run: cargo +$MSRV clippy --all-features --workspace -- -D warnings

diff --git a/third_party/rust/naga/CHANGELOG.md b/third_party/rust/naga/CHANGELOG.md
@@ -1,5 +1,99 @@
 # Change Log
 
+## Unreleased
+
+#### GENERAL
+
+- Bump MSRV to 1.65 ([#2420](https://github.com/gfx-rs/naga/pull/2420)) **@jimblandy**
+
+## v0.13 (2023-07-21)
+
+#### GENERAL
+
+- Move from `make` to `cargo xtask` workflows. ([#2297](https://github.com/gfx-rs/naga/pull/2297)) **@ErichDonGubler**
+- Omit non referenced expressions from output. ([#2378](https://github.com/gfx-rs/naga/pull/2378)) **@teoxoy**
+- Bump `bitflags` to v2. ([#2358](https://github.com/gfx-rs/naga/pull/2358)) **@daxpedda**
+- Implement `workgroupUniformLoad`. ([#2201](https://github.com/gfx-rs/naga/pull/2201)) **@DJMcNab**
+
+#### API
+
+- Expose early depth test field. ([#2393](https://github.com/gfx-rs/naga/pull/2393)) **@Joeoc2001**
+- Split image bounds check policy. ([#2265](https://github.com/gfx-rs/naga/pull/2265)) **@teoxoy**
+- Change type of constant sized arrays to `NonZeroU32`. ([#2337](https://github.com/gfx-rs/naga/pull/2337)) **@teoxoy**
+- Introduce `GlobalCtx`. ([#2335](https://github.com/gfx-rs/naga/pull/2335)) **@teoxoy**
+- Introduce `Expression::Literal`. ([#2333](https://github.com/gfx-rs/naga/pull/2333)) **@teoxoy**
+- Introduce `Expression::ZeroValue`. ([#2332](https://github.com/gfx-rs/naga/pull/2332)) **@teoxoy**
+- Add support for const-expressions (only at the API level, functionality is still WIP). ([#2266](https://github.com/gfx-rs/naga/pull/2266)) **@teoxoy**, **@jimblandy**
+
+#### DOCS
+
+- Document which expressions are in scope for a `break_if` expression. ([#2326](https://github.com/gfx-rs/naga/pull/2326)) **@jimblandy**
+
+#### VALIDATOR
+
+- Don't `use std::opsIndex`, used only when `"validate"` is on. ([#2383](https://github.com/gfx-rs/naga/pull/2383)) **@jimblandy**
+- Remove unneeded `ConstantError::Unresolved{Component,Size}`. ([#2330](https://github.com/gfx-rs/naga/pull/2330)) **@ErichDonGubler**
+- Remove `TypeError::UnresolvedBase`. ([#2308](https://github.com/gfx-rs/naga/pull/2308)) **@ErichDonGubler**
+
+#### WGSL-IN
+
+- Error on param redefinition. ([#2342](https://github.com/gfx-rs/naga/pull/2342)) **@SparkyPotato**
+
+#### SPV-IN
+
+- Improve documentation for SPIR-V control flow parsing. ([#2324](https://github.com/gfx-rs/naga/pull/2324)) **@jimblandy**
+- Obey the `is_depth` field of `OpTypeImage`. ([#2341](https://github.com/gfx-rs/naga/pull/2341)) **@expenses**
+- Convert conditional backedges to `break if`. ([#2290](https://github.com/gfx-rs/naga/pull/2290)) **@eddyb**
+
+#### GLSL-IN
+
+- Support commas in structure definitions. ([#2400](https://github.com/gfx-rs/naga/pull/2400)) **@fornwall**
+
+#### SPV-OUT
+
+- Add debug info. ([#2379](https://github.com/gfx-rs/naga/pull/2379)) **@wicast**
+- Use `IndexSet` instead of `HashSet` for iterated sets (capabilities/extensions). ([#2389](https://github.com/gfx-rs/naga/pull/2389)) **@eddyb**
+- Support array bindings of buffers. ([#2282](https://github.com/gfx-rs/naga/pull/2282)) **@kvark**
+
+#### MSL-OUT
+
+- Rename `allow_point_size` to `allow_and_force_point_size`. ([#2280](https://github.com/gfx-rs/naga/pull/2280)) **@teoxoy**
+- Initialize arrays inline. ([#2331](https://github.com/gfx-rs/naga/pull/2331)) **@teoxoy**
+
+#### HLSL-OUT
+
+- Implement Pack/Unpack for HLSL. ([#2353](https://github.com/gfx-rs/naga/pull/2353)) **@Elabajaba**
+- Complete HLSL reserved symbols. ([#2367](https://github.com/gfx-rs/naga/pull/2367)) **@teoxoy**
+- Handle case insensitive FXC keywords. ([#2347](https://github.com/gfx-rs/naga/pull/2347)) **@PJB3005**
+- Fix return type for firstbitlow/high. ([#2315](https://github.com/gfx-rs/naga/pull/2315)) **@evahop**
+
+#### GLSL-OUT
+
+- `textureSize` level must be a signed integer. ([#2397](https://github.com/gfx-rs/naga/pull/2397)) **@nical**
+- Fix functions with array return type. ([#2382](https://github.com/gfx-rs/naga/pull/2382)) **@Gordon-F**
+
+#### WGSL-OUT
+
+- Output `@interpolate(flat)` attribute for integer locations. ([#2318](https://github.com/gfx-rs/naga/pull/2318)) **@expenses**
+
+## v0.12.3 (2023-07-09)
+
+#### WGSL-OUT
+
+- (Backport) Output `@interpolate(flat)` attribute for integer locations. ([#2318](https://github.com/gfx-rs/naga/pull/2318)) **@expenses**
+
+## v0.12.2 (2023-05-30)
+
+#### SPV-OUT
+
+- (Backport) Support array bindings of buffers. ([#2282](https://github.com/gfx-rs/naga/pull/2282)) **@kvark**
+
+## v0.12.1 (2023-05-18)
+
+#### SPV-IN
+
+- (Backport) Convert conditional backedges to `break if`. ([#2290](https://github.com/gfx-rs/naga/pull/2290)) **@eddyb**
+
 ## v0.12 (2023-04-19)
 
 #### GENERAL
@@ -71,6 +165,12 @@
 - Skip `invariant` for `gl_FragCoord` on WebGL2. ([#2254](https://github.com/gfx-rs/naga/pull/2254)) **@grovesNL**
 - Inject default `gl_PointSize = 1.0` in vertex shaders if `FORCE_POINT_SIZE` option was set. ([#2223](https://github.com/gfx-rs/naga/pull/2223)) **@REASY**
 
+## v0.11.1 (2023-05-18)
+
+#### SPV-IN
+
+- (Backport) Convert conditional backedges to `break if`. ([#2290](https://github.com/gfx-rs/naga/pull/2290)) **@eddyb**
+
 ## v0.11 (2023-01-25)
 
 - Move to the Rust 2021 edition ([#2085](https://github.com/gfx-rs/naga/pull/2085)) **@ErichDonGubler**
@@ -163,6 +263,14 @@
 
 - Write correct scalar kind when `width != 4` ([#1514](https://github.com/gfx-rs/naga/pull/1514)) **@fintelia**
 
+## v0.10.1 (2023-06-21)
+
+SPV-OUT
+- Backport #2389 (Use `IndexSet` instead of `HashSet` for iterated sets (capabilities/extensions)) by @eddyb, @jimblandy in https://github.com/gfx-rs/naga/pull/2391
+
+SPV-IN
+- Backport #2290 (Convert conditional backedges to `break if`) by @eddyb in https://github.com/gfx-rs/naga/pull/2387
+
 ## v0.10 (2022-10-05)
 
 - Make termcolor dependency optional by @AldaronLau in https://github.com/gfx-rs/naga/pull/2014

diff --git a/third_party/rust/naga/Cargo.toml b/third_party/rust/naga/Cargo.toml
@@ -11,7 +11,7 @@
 
 [package]
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.65"
 name = "naga"
 version = "0.13.0"
 authors = ["Naga Developers"]
@@ -49,14 +49,14 @@ harness = false
 
 [dependencies]
 bit-set = "0.5"
-bitflags = "2"
+bitflags = "2.2"
 log = "0.4"
 num-traits = "0.2"
 rustc-hash = "1.1.0"
 thiserror = "1.0.21"
 
 [dependencies.arbitrary]
-version = "1.0.2"
+version = "1.3"
 features = ["derive"]
 optional = true
 
@@ -69,7 +69,7 @@ version = "0.2.1"
 optional = true
 
 [dependencies.indexmap]
-version = "1.9.2"
+version = "2"
 features = ["std"]
 
 [dependencies.petgraph]
@@ -134,7 +134,7 @@ default = []
 deserialize = [
     "serde",
     "bitflags/serde",
-    "indexmap/serde-1",
+    "indexmap/serde",
 ]
 dot-out = []
 glsl-in = ["pp-rs"]
@@ -144,7 +144,7 @@ msl-out = []
 serialize = [
     "serde",
     "bitflags/serde",
-    "indexmap/serde-1",
+    "indexmap/serde",
 ]
 span = [
     "codespan-reporting",

diff --git a/third_party/rust/naga/README.md b/third_party/rust/naga/README.md
@@ -4,7 +4,7 @@
 [![Crates.io](https://img.shields.io/crates/v/naga.svg?label=naga)](https://crates.io/crates/naga)
 [![Docs.rs](https://docs.rs/naga/badge.svg)](https://docs.rs/naga)
 [![Build Status](https://github.com/gfx-rs/naga/workflows/pipeline/badge.svg)](https://github.com/gfx-rs/naga/actions)
-![MSRV](https://img.shields.io/badge/rustc-1.63+-blue.svg)
+![MSRV](https://img.shields.io/badge/rustc-1.65+-blue.svg)
 [![codecov.io](https://codecov.io/gh/gfx-rs/naga/branch/master/graph/badge.svg?token=9VOKYO8BM2)](https://codecov.io/gh/gfx-rs/naga)
 
 The shader translation library for the needs of [wgpu](https://github.com/gfx-rs/wgpu).