Skip to content

Commit 35617cf

Browse files
marco-cmarco-c
committed
Bug 1873164 - Update wgpu to revision 4b82121501a61c2c2e11cb472d70ba54af3aa12d. r=webgpu-reviewers,supply-chain-reviewers,ErichDonGubler
Changelog * #4927 BGL Weak Pointer Deduplication Pool By cwfitzgerald in gfx-rs/wgpu#4927 * #4958 Change examples page menu on smaller screens By Dinnerbone in gfx-rs/wgpu#4958 * #4950 Bump anyhow from 1.0.77 to 1.0.78 By dependabot[bot] in gfx-rs/wgpu#4950 * #4957 Disable Linux Tests By cwfitzgerald in gfx-rs/wgpu#4957 * #4960 Fix incorrect ConfigureSurfaceError::TooLarge message By Dinnerbone in gfx-rs/wgpu#4960 * #4935 Add `cfg_aliases` to `wgpu` By daxpedda in gfx-rs/wgpu#4935 * #4939 hello_compute: check for missing command-line args By vilcans in gfx-rs/wgpu#4939 * #4948 Bump winit from 0.29.6 to 0.29.8 By dependabot[bot] in gfx-rs/wgpu#4948 * #4944 Fix xtask wasm-bindgen install By rukai in gfx-rs/wgpu#4944 * #4858 [glsl-in] fix swizzle in global const context By teoxoy in gfx-rs/wgpu#4858 * #4968 [gl] fix RGBA8 format capabilities By teoxoy in gfx-rs/wgpu#4968 * #4947 Avoid allocating during queue submit By udoprog in gfx-rs/wgpu#4947 * #4965 Bump serde from 1.0.193 to 1.0.194 By dependabot[bot] in gfx-rs/wgpu#4965 * #4975 Fix Hang in Multithreaded Compute Test By cwfitzgerald in gfx-rs/wgpu#4975 * #4966 Bump anyhow from 1.0.78 to 1.0.79 By dependabot[bot] in gfx-rs/wgpu#4966 * #4978 Bump thiserror from 1.0.52 to 1.0.56 By dependabot[bot] in gfx-rs/wgpu#4978 * #4979 Bump syn from 2.0.46 to 2.0.47 By dependabot[bot] in gfx-rs/wgpu#4979 * #4977 Use Custom Mesa for Building By cwfitzgerald in gfx-rs/wgpu#4977 * #4981 Bump serde_json from 1.0.108 to 1.0.110 By dependabot[bot] in gfx-rs/wgpu#4981 * #4959 wgpu-hal: Fix Mesa version check for version with suffix containing `.` By ids1024 in gfx-rs/wgpu#4959 * #4976 Shorten Lock Lifetimes By cwfitzgerald in gfx-rs/wgpu#4976 * #4980 Pin DXC and Vulkan SDK version By cwfitzgerald in gfx-rs/wgpu#4980 * #4974 gles: use already existing debug__fn private capabilty instead of checking extensions By valaphee in gfx-rs/wgpu#4974 * #4987 Remove Mac CI By cwfitzgerald in gfx-rs/wgpu#4987 * #4990 Fix Queue::write_texture, Fix DX12 write_texture_subset_2d and re-enable the test. By dtzxporter in gfx-rs/wgpu#4990 * #4994 Bump syn from 2.0.47 to 2.0.48 By dependabot[bot] in gfx-rs/wgpu#4994 * #4993 Bump serde_json from 1.0.110 to 1.0.111 By dependabot[bot] in gfx-rs/wgpu#4993 * #4992 Bump gpu-allocator from 0.24.0 to 0.25.0 By dependabot[bot] in gfx-rs/wgpu#4992 * #4995 Add Verbosity Flags to wgpu-info By cwfitzgerald in gfx-rs/wgpu#4995 * #4996 Dependency Update Rollup By cwfitzgerald in gfx-rs/wgpu#4996 * #4954 Put raw texture access behind snatch guards By nical in gfx-rs/wgpu#4954 * #4954 Put raw texture access behind snatch guards By nical in gfx-rs/wgpu#4954 * #4969 Texture snatching By nical in gfx-rs/wgpu#4969 * #4969 Texture snatching By nical in gfx-rs/wgpu#4969 Differential Revision: https://phabricator.services.mozilla.com/D197786 UltraBlame original commit: 17af24495b14543eed7f3cfd1434a961d879f47e
1 parent 36e92b5 commit 35617cf

Some content is hidden

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

58 files changed

+2773
-2346
lines changed

‎.cargo/config.in

Lines changed: 2 additions & 2 deletions
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=46757372cc02d6608124502104a0c225e1744fd7"]
28+
[source."git+https://github.com/gfx-rs/wgpu?rev=4b82121501a61c2c2e11cb472d70ba54af3aa12d"]
2929
git = "https://github.com/gfx-rs/wgpu"
30-
rev = "46757372cc02d6608124502104a0c225e1744fd7"
30+
rev = "4b82121501a61c2c2e11cb472d70ba54af3aa12d"
3131
replace-with = "vendored-sources"
3232

3333
[source."git+https://github.com/hsivonen/chardetng?rev=3484d3e3ebdc8931493aa5df4d7ee9360a90e76b"]

‎Cargo.lock

Lines changed: 14 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gfx/wgpu_bindings/Cargo.toml

Lines changed: 7 additions & 7 deletions
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 = "46757372cc02d6608124502104a0c225e1744fd7"
20+
rev = "4b82121501a61c2c2e11cb472d70ba54af3aa12d"
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", "api_log_info"]
@@ -27,36 +27,36 @@ features = ["replay", "trace", "serial-pass", "strict_asserts", "wgsl", "api_log
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 = "46757372cc02d6608124502104a0c225e1744fd7"
30+
rev = "4b82121501a61c2c2e11cb472d70ba54af3aa12d"
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 = "46757372cc02d6608124502104a0c225e1744fd7"
37+
rev = "4b82121501a61c2c2e11cb472d70ba54af3aa12d"
3838
features = ["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 = "46757372cc02d6608124502104a0c225e1744fd7"
44+
rev = "4b82121501a61c2c2e11cb472d70ba54af3aa12d"
4545
features = ["vulkan"]
4646

4747
[dependencies.wgt]
4848
package = "wgpu-types"
4949
git = "https://github.com/gfx-rs/wgpu"
50-
rev = "46757372cc02d6608124502104a0c225e1744fd7"
50+
rev = "4b82121501a61c2c2e11cb472d70ba54af3aa12d"
5151

5252
[dependencies.wgh]
5353
package = "wgpu-hal"
5454
git = "https://github.com/gfx-rs/wgpu"
55-
rev = "46757372cc02d6608124502104a0c225e1744fd7"
55+
rev = "4b82121501a61c2c2e11cb472d70ba54af3aa12d"
5656

5757
[target.'cfg(windows)'.dependencies.d3d12]
5858
git = "https://github.com/gfx-rs/wgpu"
59-
rev = "46757372cc02d6608124502104a0c225e1744fd7"
59+
rev = "4b82121501a61c2c2e11cb472d70ba54af3aa12d"
6060

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

‎gfx/wgpu_bindings/moz.yaml

Lines changed: 2 additions & 2 deletions
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 46757372cc02d6608124502104a0c225e1744fd7
23+
release: commit 4b82121501a61c2c2e11cb472d70ba54af3aa12d
2424

2525
# Revision to pull in
2626
# Must be a long or short commit SHA (long preferred)
27-
revision: 46757372cc02d6608124502104a0c225e1744fd7
27+
revision: 4b82121501a61c2c2e11cb472d70ba54af3aa12d
2828

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

‎supply-chain/audits.toml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,7 +1269,7 @@ who = [
12691269
"Nicolas Silva <nical@fastmail.com>",
12701270
]
12711271
criteria = "safe-to-deploy"
1272-
delta = "0.7.0 -> 0.7.0@git:46757372cc02d6608124502104a0c225e1744fd7"
1272+
delta = "0.7.0 -> 0.7.0@git:4b82121501a61c2c2e11cb472d70ba54af3aa12d"
12731273
importable = false
12741274

12751275
[[audits.darling]]
@@ -2541,7 +2541,7 @@ delta = "0.13.0 -> 0.14.0"
25412541
[[audits.naga]]
25422542
who = ["Jim Blandy <jimb@red-bean.com>", "Nicolas Silva <nical@fastmail.com>"]
25432543
criteria = "safe-to-deploy"
2544-
delta = "0.14.0 -> 0.14.2@git:46757372cc02d6608124502104a0c225e1744fd7"
2544+
delta = "0.14.0 -> 0.14.2@git:4b82121501a61c2c2e11cb472d70ba54af3aa12d"
25452545
importable = false
25462546

25472547
[[audits.net2]]
@@ -3519,6 +3519,11 @@ who = "Mike Hommey <mh+mozilla@glandium.org>"
35193519
criteria = "safe-to-deploy"
35203520
delta = "0.4.4 -> 0.4.7"
35213521

3522+
[[audits.spirv]]
3523+
who = "Nicolas Silva <nical@fastmail.com>"
3524+
criteria = "safe-to-deploy"
3525+
delta = "0.2.0+1.5.4 -> 0.3.0+sdk-1.3.268.0"
3526+
35223527
[[audits.strck]]
35233528
who = "Makoto Kato <m_kato@ga2.so-net.ne.jp>"
35243529
criteria = "safe-to-deploy"
@@ -4308,7 +4313,7 @@ delta = "0.17.0 -> 0.18.0"
43084313
[[audits.wgpu-core]]
43094314
who = ["Jim Blandy <jimb@red-bean.com>", "Nicolas Silva <nical@fastmail.com>"]
43104315
criteria = "safe-to-deploy"
4311-
delta = "0.18.0 -> 0.18.0@git:46757372cc02d6608124502104a0c225e1744fd7"
4316+
delta = "0.18.0 -> 0.18.0@git:4b82121501a61c2c2e11cb472d70ba54af3aa12d"
43124317
importable = false
43134318

43144319
[[audits.wgpu-hal]]
@@ -4357,7 +4362,7 @@ delta = "0.17.0 -> 0.18.0"
43574362
[[audits.wgpu-hal]]
43584363
who = ["Jim Blandy <jimb@red-bean.com>", "Nicolas Silva <nical@fastmail.com>"]
43594364
criteria = "safe-to-deploy"
4360-
delta = "0.18.0 -> 0.18.0@git:46757372cc02d6608124502104a0c225e1744fd7"
4365+
delta = "0.18.0 -> 0.18.0@git:4b82121501a61c2c2e11cb472d70ba54af3aa12d"
43614366
importable = false
43624367

43634368
[[audits.wgpu-types]]
@@ -4406,7 +4411,7 @@ delta = "0.17.0 -> 0.18.0"
44064411
[[audits.wgpu-types]]
44074412
who = ["Jim Blandy <jimb@red-bean.com>", "Nicolas Silva <nical@fastmail.com>"]
44084413
criteria = "safe-to-deploy"
4409-
delta = "0.18.0 -> 0.18.0@git:46757372cc02d6608124502104a0c225e1744fd7"
4414+
delta = "0.18.0 -> 0.18.0@git:4b82121501a61c2c2e11cb472d70ba54af3aa12d"
44104415
importable = false
44114416

44124417
[[audits.whatsys]]

‎supply-chain/imports.lock

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,13 @@ user-id = 3618
545545
user-login = "dtolnay"
546546
user-name = "David Tolnay"
547547

548+
[[publisher.serde]]
549+
version = "1.0.194"
550+
when = "2024-01-02"
551+
user-id = 3618
552+
user-login = "dtolnay"
553+
user-name = "David Tolnay"
554+
548555
[[publisher.serde_bytes]]
549556
version = "0.11.9"
550557
when = "2023-02-05"
@@ -573,6 +580,13 @@ user-id = 3618
573580
user-login = "dtolnay"
574581
user-name = "David Tolnay"
575582

583+
[[publisher.serde_derive]]
584+
version = "1.0.194"
585+
when = "2024-01-02"
586+
user-id = 3618
587+
user-login = "dtolnay"
588+
user-name = "David Tolnay"
589+
576590
[[publisher.serde_json]]
577591
version = "1.0.93"
578592
when = "2023-02-08"

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

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎third_party/rust/naga/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ bitflags = "2.2"
5151
log = "0.4"
5252
num-traits = "0.2"
5353
rustc-hash = "1.1.0"
54-
thiserror = "1.0.52"
54+
thiserror = "1.0.56"
5555

5656
[dependencies.arbitrary]
5757
version = "1.3"
@@ -78,12 +78,12 @@ version = "0.2.1"
7878
optional = true
7979

8080
[dependencies.serde]
81-
version = "1.0.193"
81+
version = "1.0.194"
8282
features = ["derive"]
8383
optional = true
8484

8585
[dependencies.spirv]
86-
version = "0.2"
86+
version = "0.3"
8787
optional = true
8888

8989
[dependencies.termcolor]
@@ -113,7 +113,7 @@ version = "1.0"
113113
features = ["derive"]
114114

115115
[dev-dependencies.spirv]
116-
version = "0.2"
116+
version = "0.3"
117117
features = ["deserialize"]
118118

119119
[features]

‎third_party/rust/naga/src/front/glsl/context.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1478,7 +1478,11 @@ impl Index<Handle<Expression>> for Context<'_> {
14781478
type Output = Expression;
14791479

14801480
fn index(&self, index: Handle<Expression>) -> &Self::Output {
1481-
&self.expressions[index]
1481+
if self.is_const {
1482+
&self.module.const_expressions[index]
1483+
} else {
1484+
&self.expressions[index]
1485+
}
14821486
}
14831487
}
14841488

‎third_party/rust/naga/src/front/spv/convert.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use super::error::Error;
2-
use num_traits::cast::FromPrimitive;
32
use std::convert::TryInto;
43

54
pub(super) const fn map_binary_operator(word: spirv::Op) -> Result<crate::BinaryOperator, Error> {

0 commit comments

Comments
 (0)