Skip to content

Commit ec87ad5

Browse files
marco-cmarco-c
committed
Bug 1865585 - Update wgpu to revision 6e21f7a9291db4395192d6b510d906978ae2d251. 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 UltraBlame original commit: eb839abb42abde594497e419517260997fa1fc4d
1 parent 0e6a515 commit ec87ad5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+6952
-7079
lines changed

‎.cargo/config.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ git = "https://github.com/franziskuskiefer/cose-rust"
2525
rev = "43c22248d136c8b38fe42ea709d08da6355cf04b"
2626
replace-with = "vendored-sources"
2727

28-
[source."git+https://github.com/gfx-rs/wgpu?rev=3ec547cdcaaa14488327d8f1b5f7736278c4178d"]
28+
[source."git+https://github.com/gfx-rs/wgpu?rev=6e21f7a9291db4395192d6b510d906978ae2d251"]
2929
git = "https://github.com/gfx-rs/wgpu"
30-
rev = "3ec547cdcaaa14488327d8f1b5f7736278c4178d"
30+
rev = "6e21f7a9291db4395192d6b510d906978ae2d251"
3131
replace-with = "vendored-sources"
3232

3333
[source."git+https://github.com/glandium/warp?rev=4af45fae95bc98b0eba1ef0db17e1dac471bb23d"]

‎Cargo.lock

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gfx/wgpu_bindings/Cargo.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ default = []
1717
[dependencies.wgc]
1818
package = "wgpu-core"
1919
git = "https://github.com/gfx-rs/wgpu"
20-
rev = "3ec547cdcaaa14488327d8f1b5f7736278c4178d"
20+
rev = "6e21f7a9291db4395192d6b510d906978ae2d251"
2121
#Note: "replay" shouldn't ideally be needed,
2222
# but it allows us to serialize everything across IPC.
2323
features = ["replay", "trace", "serial-pass", "strict_asserts", "wgsl"]
@@ -27,36 +27,36 @@ features = ["replay", "trace", "serial-pass", "strict_asserts", "wgsl"]
2727
[target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies.wgc]
2828
package = "wgpu-core"
2929
git = "https://github.com/gfx-rs/wgpu"
30-
rev = "3ec547cdcaaa14488327d8f1b5f7736278c4178d"
30+
rev = "6e21f7a9291db4395192d6b510d906978ae2d251"
3131
features = ["metal"]
3232

3333
# We want the wgpu-core Direct3D backends on Windows.
3434
[target.'cfg(windows)'.dependencies.wgc]
3535
package = "wgpu-core"
3636
git = "https://github.com/gfx-rs/wgpu"
37-
rev = "3ec547cdcaaa14488327d8f1b5f7736278c4178d"
37+
rev = "6e21f7a9291db4395192d6b510d906978ae2d251"
3838
features = ["dx11", "dx12"]
3939

4040
# We want the wgpu-core Vulkan backend on Linux and Windows.
4141
[target.'cfg(any(windows, all(unix, not(any(target_os = "macos", target_os = "ios")))))'.dependencies.wgc]
4242
package = "wgpu-core"
4343
git = "https://github.com/gfx-rs/wgpu"
44-
rev = "3ec547cdcaaa14488327d8f1b5f7736278c4178d"
44+
rev = "6e21f7a9291db4395192d6b510d906978ae2d251"
4545
features = ["vulkan"]
4646

4747
[dependencies.wgt]
4848
package = "wgpu-types"
4949
git = "https://github.com/gfx-rs/wgpu"
50-
rev = "3ec547cdcaaa14488327d8f1b5f7736278c4178d"
50+
rev = "6e21f7a9291db4395192d6b510d906978ae2d251"
5151

5252
[dependencies.wgh]
5353
package = "wgpu-hal"
5454
git = "https://github.com/gfx-rs/wgpu"
55-
rev = "3ec547cdcaaa14488327d8f1b5f7736278c4178d"
55+
rev = "6e21f7a9291db4395192d6b510d906978ae2d251"
5656

5757
[target.'cfg(windows)'.dependencies.d3d12]
5858
git = "https://github.com/gfx-rs/wgpu"
59-
rev = "3ec547cdcaaa14488327d8f1b5f7736278c4178d"
59+
rev = "6e21f7a9291db4395192d6b510d906978ae2d251"
6060

6161
[target.'cfg(windows)'.dependencies]
6262
winapi = "0.3"

‎gfx/wgpu_bindings/moz.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ origin:
2020

2121
# Human-readable identifier for this version/release
2222
# Generally "version NNN", "tag SSS", "bookmark SSS"
23-
release: commit 3ec547cdcaaa14488327d8f1b5f7736278c4178d
23+
release: commit 6e21f7a9291db4395192d6b510d906978ae2d251
2424

2525
# Revision to pull in
2626
# Must be a long or short commit SHA (long preferred)
27-
revision: 3ec547cdcaaa14488327d8f1b5f7736278c4178d
27+
revision: 6e21f7a9291db4395192d6b510d906978ae2d251
2828

2929
license: ['MIT', 'Apache-2.0']
3030

‎supply-chain/audits.toml

+25
Original file line numberDiff line numberDiff line change
@@ -1166,6 +1166,11 @@ who = "Nicolas Silva <nical@fastmail.com>"
11661166
criteria = "safe-to-deploy"
11671167
delta = "0.7.0 -> 0.7.0@git:ba3d6898f18c25bb5a2b8ba18790134b97758e83"
11681168

1169+
[[audits.d3d12]]
1170+
who = "Nicolas Silva <nical@fastmail.com>"
1171+
criteria = "safe-to-deploy"
1172+
delta = "0.7.0@git:3ec547cdcaaa14488327d8f1b5f7736278c4178d -> 0.7.0@git:6e21f7a9291db4395192d6b510d906978ae2d251"
1173+
11691174
[[audits.d3d12]]
11701175
who = "Teodor Tanasoaia <ttanasoaia@mozilla.com>"
11711176
criteria = "safe-to-deploy"
@@ -2359,6 +2364,11 @@ who = "Nicolas Silva <nical@fastmail.com>"
23592364
criteria = "safe-to-deploy"
23602365
delta = "0.14.0@git:34e947de4b3e0b0d6b0e2f40cede926467ea9f1e -> 0.14.0@git:ba3d6898f18c25bb5a2b8ba18790134b97758e83"
23612366

2367+
[[audits.naga]]
2368+
who = "Nicolas Silva <nical@fastmail.com>"
2369+
criteria = "safe-to-deploy"
2370+
delta = "0.14.0@git:3ec547cdcaaa14488327d8f1b5f7736278c4178d -> 0.14.0@git:6e21f7a9291db4395192d6b510d906978ae2d251"
2371+
23622372
[[audits.naga]]
23632373
who = "Teodor Tanasoaia <ttanasoaia@mozilla.com>"
23642374
criteria = "safe-to-deploy"
@@ -4087,6 +4097,11 @@ who = "Nicolas Silva <nical@fastmail.com>"
40874097
criteria = "safe-to-deploy"
40884098
delta = "0.18.0@git:34e947de4b3e0b0d6b0e2f40cede926467ea9f1e -> 0.18.0@git:ba3d6898f18c25bb5a2b8ba18790134b97758e83"
40894099

4100+
[[audits.wgpu-core]]
4101+
who = "Nicolas Silva <nical@fastmail.com>"
4102+
criteria = "safe-to-deploy"
4103+
delta = "0.18.0@git:3ec547cdcaaa14488327d8f1b5f7736278c4178d -> 0.18.0@git:6e21f7a9291db4395192d6b510d906978ae2d251"
4104+
40904105
[[audits.wgpu-core]]
40914106
who = "Teodor Tanasoaia <ttanasoaia@mozilla.com>"
40924107
criteria = "safe-to-deploy"
@@ -4145,6 +4160,11 @@ who = "Nicolas Silva <nical@fastmail.com>"
41454160
criteria = "safe-to-deploy"
41464161
delta = "0.18.0@git:34e947de4b3e0b0d6b0e2f40cede926467ea9f1e -> 0.18.0@git:ba3d6898f18c25bb5a2b8ba18790134b97758e83"
41474162

4163+
[[audits.wgpu-hal]]
4164+
who = "Nicolas Silva <nical@fastmail.com>"
4165+
criteria = "safe-to-deploy"
4166+
delta = "0.18.0@git:3ec547cdcaaa14488327d8f1b5f7736278c4178d -> 0.18.0@git:6e21f7a9291db4395192d6b510d906978ae2d251"
4167+
41484168
[[audits.wgpu-hal]]
41494169
who = "Teodor Tanasoaia <ttanasoaia@mozilla.com>"
41504170
criteria = "safe-to-deploy"
@@ -4203,6 +4223,11 @@ who = "Nicolas Silva <nical@fastmail.com>"
42034223
criteria = "safe-to-deploy"
42044224
delta = "0.18.0@git:34e947de4b3e0b0d6b0e2f40cede926467ea9f1e -> 0.18.0@git:ba3d6898f18c25bb5a2b8ba18790134b97758e83"
42054225

4226+
[[audits.wgpu-types]]
4227+
who = "Nicolas Silva <nical@fastmail.com>"
4228+
criteria = "safe-to-deploy"
4229+
delta = "0.18.0@git:3ec547cdcaaa14488327d8f1b5f7736278c4178d -> 0.18.0@git:6e21f7a9291db4395192d6b510d906978ae2d251"
4230+
42064231
[[audits.wgpu-types]]
42074232
who = "Teodor Tanasoaia <ttanasoaia@mozilla.com>"
42084233
criteria = "safe-to-deploy"

‎third_party/rust/naga/.cargo-checksum.json

+1-1
Large diffs are not rendered by default.

‎third_party/rust/naga/Cargo.toml

-9
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ optional = true
5555

5656
[dependencies.codespan-reporting]
5757
version = "0.11.0"
58-
optional = true
5958

6059
[dependencies.hexf-parse]
6160
version = "0.2.1"
@@ -84,7 +83,6 @@ optional = true
8483

8584
[dependencies.termcolor]
8685
version = "1.4.0"
87-
optional = true
8886

8987
[dependencies.unicode-xid]
9088
version = "0.2.3"
@@ -137,20 +135,13 @@ serialize = [
137135
"bitflags/serde",
138136
"indexmap/serde",
139137
]
140-
span = [
141-
"codespan-reporting",
142-
"termcolor",
143-
]
144138
spv-in = [
145139
"petgraph",
146140
"spirv",
147141
]
148142
spv-out = ["spirv"]
149-
validate = []
150143
wgsl-in = [
151-
"codespan-reporting",
152144
"hexf-parse",
153-
"termcolor",
154145
"unicode-xid",
155146
]
156147
wgsl-out = []

‎third_party/rust/naga/benches/criterion.rs

-5
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ fn gather_modules() -> Vec<naga::Module> {
119119
fn validation(c: &mut Criterion) {
120120
let inputs = gather_modules();
121121
let mut group = c.benchmark_group("valid");
122-
#[cfg(feature = "validate")]
123122
group.bench_function("safe", |b| {
124123
let mut validator = naga::valid::Validator::new(
125124
naga::valid::ValidationFlags::all(),
@@ -131,7 +130,6 @@ fn validation(c: &mut Criterion) {
131130
}
132131
});
133132
});
134-
#[cfg(feature = "validate")]
135133
group.bench_function("unsafe", |b| {
136134
let mut validator = naga::valid::Validator::new(
137135
naga::valid::ValidationFlags::empty(),
@@ -146,7 +144,6 @@ fn validation(c: &mut Criterion) {
146144
}
147145

148146
fn backends(c: &mut Criterion) {
149-
#[cfg(feature = "validate")]
150147
let inputs = {
151148
let mut validator = naga::valid::Validator::new(
152149
naga::valid::ValidationFlags::empty(),
@@ -158,8 +155,6 @@ fn backends(c: &mut Criterion) {
158155
.flat_map(|module| validator.validate(&module).ok().map(|info| (module, info)))
159156
.collect::<Vec<_>>()
160157
};
161-
#[cfg(not(feature = "validate"))]
162-
let inputs = Vec::<(naga::Module, naga::valid::ModuleInfo)>::new();
163158

164159
let mut group = c.benchmark_group("back");
165160
#[cfg(feature = "wgsl-out")]

0 commit comments

Comments
 (0)