Bug 1865585 - Update wgpu to revision 6e21f7a9291db4395192d6b510d90…

…6978ae2d251. r=webgpu-reviewers,supply-chain-reviewers,ErichDonGubler,teoxoy Note: This revision contains the arcanization work # Changelog * #4702 Add `WasmNotSendSync` By daxpedda in gfx-rs/wgpu#4702 * #4707 Add more metal keywords By fornwall in gfx-rs/wgpu#4707 * #4706 [naga] remove `span` and `validate` features By teoxoy in gfx-rs/wgpu#4706 * #4709 [dx12] filter out haswell iGPUs By teoxoy in gfx-rs/wgpu#4709 * #4712 Fix typo in pull request template. By jimblandy in gfx-rs/wgpu#4712 * #4598 Add more lints By daxpedda in gfx-rs/wgpu#4598 * #4713 [naga wgsl-in] Include base when printing pointer and array types. By jimblandy in gfx-rs/wgpu#4713 * #4718 [vk] check that adapters are Vulkan compliant By teoxoy in gfx-rs/wgpu#4718 * #4719 [naga] Let constant evaluation of `As` preserve `Splat` expressions. By jimblandy in gfx-rs/wgpu#4719 * #4725 Corrects typo in examples FrameCounter By cantudo in gfx-rs/wgpu#4725 * #3626 Arcanization of wgpu core resources By gents83 in gfx-rs/wgpu#3626 Differential Revision: https://phabricator.services.mozilla.com/D194048
vinnydiehl · Nov 20, 2023 · 766d246 · 766d246
1 parent 9de2479
commit 766d246
Show file tree

Hide file tree

Showing 91 changed files with 7,024 additions and 7,151 deletions.
diff --git a/.cargo/config.in b/.cargo/config.in
@@ -25,9 +25,9 @@ git = "https://github.com/franziskuskiefer/cose-rust"
 rev = "43c22248d136c8b38fe42ea709d08da6355cf04b"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/gfx-rs/wgpu?rev=3ec547cdcaaa14488327d8f1b5f7736278c4178d"]
+[source."git+https://github.com/gfx-rs/wgpu?rev=6e21f7a9291db4395192d6b510d906978ae2d251"]
 git = "https://github.com/gfx-rs/wgpu"
-rev = "3ec547cdcaaa14488327d8f1b5f7736278c4178d"
+rev = "6e21f7a9291db4395192d6b510d906978ae2d251"
 replace-with = "vendored-sources"
 
 [source."git+https://github.com/glandium/warp?rev=4af45fae95bc98b0eba1ef0db17e1dac471bb23d"]

diff --git a/Cargo.lock b/Cargo.lock
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 = "3ec547cdcaaa14488327d8f1b5f7736278c4178d"
+rev = "6e21f7a9291db4395192d6b510d906978ae2d251"
 #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,36 +27,36 @@ 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 = "3ec547cdcaaa14488327d8f1b5f7736278c4178d"
+rev = "6e21f7a9291db4395192d6b510d906978ae2d251"
 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 = "3ec547cdcaaa14488327d8f1b5f7736278c4178d"
+rev = "6e21f7a9291db4395192d6b510d906978ae2d251"
 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 = "3ec547cdcaaa14488327d8f1b5f7736278c4178d"
+rev = "6e21f7a9291db4395192d6b510d906978ae2d251"
 features = ["vulkan"]
 
 [dependencies.wgt]
 package = "wgpu-types"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "3ec547cdcaaa14488327d8f1b5f7736278c4178d"
+rev = "6e21f7a9291db4395192d6b510d906978ae2d251"
 
 [dependencies.wgh]
 package = "wgpu-hal"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "3ec547cdcaaa14488327d8f1b5f7736278c4178d"
+rev = "6e21f7a9291db4395192d6b510d906978ae2d251"
 
 [target.'cfg(windows)'.dependencies.d3d12]
 git = "https://github.com/gfx-rs/wgpu"
-rev = "3ec547cdcaaa14488327d8f1b5f7736278c4178d"
+rev = "6e21f7a9291db4395192d6b510d906978ae2d251"
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.3"

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 3ec547cdcaaa14488327d8f1b5f7736278c4178d
+  release: commit 6e21f7a9291db4395192d6b510d906978ae2d251
 
   # Revision to pull in
   # Must be a long or short commit SHA (long preferred)
-  revision: 3ec547cdcaaa14488327d8f1b5f7736278c4178d
+  revision: 6e21f7a9291db4395192d6b510d906978ae2d251
 
   license: ['MIT', 'Apache-2.0']
 

diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
@@ -1166,6 +1166,11 @@ who = "Nicolas Silva <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.7.0 -> 0.7.0@git:ba3d6898f18c25bb5a2b8ba18790134b97758e83"
 
+[[audits.d3d12]]
+who = "Nicolas Silva <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.7.0@git:3ec547cdcaaa14488327d8f1b5f7736278c4178d -> 0.7.0@git:6e21f7a9291db4395192d6b510d906978ae2d251"
+
 [[audits.d3d12]]
 who = "Teodor Tanasoaia <[email protected]>"
 criteria = "safe-to-deploy"
@@ -2359,6 +2364,11 @@ who = "Nicolas Silva <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.14.0@git:34e947de4b3e0b0d6b0e2f40cede926467ea9f1e -> 0.14.0@git:ba3d6898f18c25bb5a2b8ba18790134b97758e83"
 
+[[audits.naga]]
+who = "Nicolas Silva <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.14.0@git:3ec547cdcaaa14488327d8f1b5f7736278c4178d -> 0.14.0@git:6e21f7a9291db4395192d6b510d906978ae2d251"
+
 [[audits.naga]]
 who = "Teodor Tanasoaia <[email protected]>"
 criteria = "safe-to-deploy"
@@ -4087,6 +4097,11 @@ who = "Nicolas Silva <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.18.0@git:34e947de4b3e0b0d6b0e2f40cede926467ea9f1e -> 0.18.0@git:ba3d6898f18c25bb5a2b8ba18790134b97758e83"
 
+[[audits.wgpu-core]]
+who = "Nicolas Silva <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.18.0@git:3ec547cdcaaa14488327d8f1b5f7736278c4178d -> 0.18.0@git:6e21f7a9291db4395192d6b510d906978ae2d251"
+
 [[audits.wgpu-core]]
 who = "Teodor Tanasoaia <[email protected]>"
 criteria = "safe-to-deploy"
@@ -4145,6 +4160,11 @@ who = "Nicolas Silva <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.18.0@git:34e947de4b3e0b0d6b0e2f40cede926467ea9f1e -> 0.18.0@git:ba3d6898f18c25bb5a2b8ba18790134b97758e83"
 
+[[audits.wgpu-hal]]
+who = "Nicolas Silva <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.18.0@git:3ec547cdcaaa14488327d8f1b5f7736278c4178d -> 0.18.0@git:6e21f7a9291db4395192d6b510d906978ae2d251"
+
 [[audits.wgpu-hal]]
 who = "Teodor Tanasoaia <[email protected]>"
 criteria = "safe-to-deploy"
@@ -4203,6 +4223,11 @@ who = "Nicolas Silva <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.18.0@git:34e947de4b3e0b0d6b0e2f40cede926467ea9f1e -> 0.18.0@git:ba3d6898f18c25bb5a2b8ba18790134b97758e83"
 
+[[audits.wgpu-types]]
+who = "Nicolas Silva <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.18.0@git:3ec547cdcaaa14488327d8f1b5f7736278c4178d -> 0.18.0@git:6e21f7a9291db4395192d6b510d906978ae2d251"
+
 [[audits.wgpu-types]]
 who = "Teodor Tanasoaia <[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/Cargo.toml b/third_party/rust/naga/Cargo.toml
@@ -55,7 +55,6 @@ optional = true
 
 [dependencies.codespan-reporting]
 version = "0.11.0"
-optional = true
 
 [dependencies.hexf-parse]
 version = "0.2.1"
@@ -84,7 +83,6 @@ optional = true
 
 [dependencies.termcolor]
 version = "1.4.0"
-optional = true
 
 [dependencies.unicode-xid]
 version = "0.2.3"
@@ -137,20 +135,13 @@ serialize = [
     "bitflags/serde",
     "indexmap/serde",
 ]
-span = [
-    "codespan-reporting",
-    "termcolor",
-]
 spv-in = [
     "petgraph",
     "spirv",
 ]
 spv-out = ["spirv"]
-validate = []
 wgsl-in = [
-    "codespan-reporting",
     "hexf-parse",
-    "termcolor",
     "unicode-xid",
 ]
 wgsl-out = []

diff --git a/third_party/rust/naga/benches/criterion.rs b/third_party/rust/naga/benches/criterion.rs
@@ -119,7 +119,6 @@ fn gather_modules() -> Vec<naga::Module> {
 fn validation(c: &mut Criterion) {
     let inputs = gather_modules();
     let mut group = c.benchmark_group("valid");
-    #[cfg(feature = "validate")]
     group.bench_function("safe", |b| {
         let mut validator = naga::valid::Validator::new(
             naga::valid::ValidationFlags::all(),
@@ -131,7 +130,6 @@ fn validation(c: &mut Criterion) {
             }
         });
     });
-    #[cfg(feature = "validate")]
     group.bench_function("unsafe", |b| {
         let mut validator = naga::valid::Validator::new(
             naga::valid::ValidationFlags::empty(),
@@ -146,7 +144,6 @@ fn validation(c: &mut Criterion) {
 }
 
 fn backends(c: &mut Criterion) {
-    #[cfg(feature = "validate")]
     let inputs = {
         let mut validator = naga::valid::Validator::new(
             naga::valid::ValidationFlags::empty(),
@@ -158,8 +155,6 @@ fn backends(c: &mut Criterion) {
             .flat_map(|module| validator.validate(&module).ok().map(|info| (module, info)))
             .collect::<Vec<_>>()
     };
-    #[cfg(not(feature = "validate"))]
-    let inputs = Vec::<(naga::Module, naga::valid::ModuleInfo)>::new();
 
     let mut group = c.benchmark_group("back");
     #[cfg(feature = "wgsl-out")]