Skip to content

Commit

Permalink
Bug 1854615 - Update wgpu to revision 7e0d6c971f900f6a8f01a9de9c41f…
Browse files Browse the repository at this point in the history
…7894164a82c. r=webgpu-reviewers,supply-chain-reviewers,teoxoy

Differential Revision: https://phabricator.services.mozilla.com/D188978
  • Loading branch information
nical committed Sep 25, 2023
1 parent ecec2b5 commit 5a050d7
Show file tree
Hide file tree
Showing 48 changed files with 882 additions and 1,709 deletions.
13 changes: 9 additions & 4 deletions .cargo/config.in
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,19 @@ git = "https://github.com/franziskuskiefer/cose-rust"
rev = "43c22248d136c8b38fe42ea709d08da6355cf04b"
replace-with = "vendored-sources"

[source."git+https://github.com/gfx-rs/naga?rev=cc87b8f9eb30bb55d0735b89d3df3e099e1a6e7c"]
[source."git+https://github.com/gfx-rs/metal-rs/?rev=d24f1a4"]
git = "https://github.com/gfx-rs/metal-rs/"
rev = "d24f1a4"
replace-with = "vendored-sources"

[source."git+https://github.com/gfx-rs/naga?rev=df8107b7"]
git = "https://github.com/gfx-rs/naga"
rev = "cc87b8f9eb30bb55d0735b89d3df3e099e1a6e7c"
rev = "df8107b7"
replace-with = "vendored-sources"

[source."git+https://github.com/gfx-rs/wgpu?rev=7fea9e934efd8d5dc03b9aa3e06b775c1ac4a23e"]
[source."git+https://github.com/gfx-rs/wgpu?rev=7e0d6c971f900f6a8f01a9de9c41f7894164a82c"]
git = "https://github.com/gfx-rs/wgpu"
rev = "7fea9e934efd8d5dc03b9aa3e06b775c1ac4a23e"
rev = "7e0d6c971f900f6a8f01a9de9c41f7894164a82c"
replace-with = "vendored-sources"

[source."git+https://github.com/glandium/prost?rev=95964e9d33df3c2a9c3f14285e262867cab6f96b"]
Expand Down
11 changes: 5 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions gfx/wgpu_bindings/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ default = []
[dependencies.wgc]
package = "wgpu-core"
git = "https://github.com/gfx-rs/wgpu"
rev = "7fea9e934efd8d5dc03b9aa3e06b775c1ac4a23e"
rev = "7e0d6c971f900f6a8f01a9de9c41f7894164a82c"
#Note: "replay" shouldn't ideally be needed,
# but it allows us to serialize everything across IPC.
features = ["replay", "trace", "serial-pass", "strict_asserts", "wgsl"]
Expand All @@ -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 = "7fea9e934efd8d5dc03b9aa3e06b775c1ac4a23e"
rev = "7e0d6c971f900f6a8f01a9de9c41f7894164a82c"
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 = "7fea9e934efd8d5dc03b9aa3e06b775c1ac4a23e"
rev = "7e0d6c971f900f6a8f01a9de9c41f7894164a82c"
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 = "7fea9e934efd8d5dc03b9aa3e06b775c1ac4a23e"
rev = "7e0d6c971f900f6a8f01a9de9c41f7894164a82c"
features = ["vulkan"]

[dependencies.wgt]
package = "wgpu-types"
git = "https://github.com/gfx-rs/wgpu"
rev = "7fea9e934efd8d5dc03b9aa3e06b775c1ac4a23e"
rev = "7e0d6c971f900f6a8f01a9de9c41f7894164a82c"

[dependencies.wgh]
package = "wgpu-hal"
git = "https://github.com/gfx-rs/wgpu"
rev = "7fea9e934efd8d5dc03b9aa3e06b775c1ac4a23e"
rev = "7e0d6c971f900f6a8f01a9de9c41f7894164a82c"

[target.'cfg(windows)'.dependencies]
d3d12 = "0.7.0"
Expand Down
4 changes: 2 additions & 2 deletions gfx/wgpu_bindings/moz.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ origin:

# Human-readable identifier for this version/release
# Generally "version NNN", "tag SSS", "bookmark SSS"
release: commit 7fea9e934efd8d5dc03b9aa3e06b775c1ac4a23e
release: commit 7e0d6c971f900f6a8f01a9de9c41f7894164a82c

# Revision to pull in
# Must be a long or short commit SHA (long preferred)
revision: 7fea9e934efd8d5dc03b9aa3e06b775c1ac4a23e
revision: 7e0d6c971f900f6a8f01a9de9c41f7894164a82c

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

Expand Down
25 changes: 25 additions & 0 deletions supply-chain/audits.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2147,6 +2147,11 @@ who = "Erich Gubler <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.25.0 -> 0.26.0"

[[audits.metal]]
who = "Nicolas Silva <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.26.0 -> 0.26.0@git:d24f1a4ae92470bf87a0c65ecfe78c9299835505"

[[audits.midir]]
who = "Bobby Holley <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -2298,6 +2303,11 @@ who = "Erich Gubler <[email protected]"
criteria = "safe-to-deploy"
delta = "0.13.0@git:bac2d82a430fbfcf100ee22b7c3bc12f3d593079 -> 0.13.0@git:7a19f3af909202c7eafd36633b5584bfbb353ecb"

[[audits.naga]]
who = "Nicolas Silva <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.13.0@git:cc87b8f9eb30bb55d0735b89d3df3e099e1a6e7c -> 0.13.0@git:df8107b78812cc2b1e3d5de35279cedc1f0da3fb"

[[audits.net2]]
who = "Mike Hommey <[email protected]>"
criteria = "safe-to-run"
Expand Down Expand Up @@ -4012,6 +4022,11 @@ who = "Erich Gubler <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.17.0@git:7c6b85756237f77bfe8d6231dfc7a1412ff662b6 -> 0.17.0@git:332cd0325da52675432830870584ec9766679c34"

[[audits.wgpu-core]]
who = "Nicolas Silva <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.17.0@git:7fea9e934efd8d5dc03b9aa3e06b775c1ac4a23e -> 0.17.0@git:7e0d6c971f900f6a8f01a9de9c41f7894164a82c"

[[audits.wgpu-hal]]
who = "Dzmitry Malyshau <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -4125,6 +4140,11 @@ who = "Erich Gubler <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.17.0@git:7c6b85756237f77bfe8d6231dfc7a1412ff662b6 -> 0.17.0@git:332cd0325da52675432830870584ec9766679c34"

[[audits.wgpu-hal]]
who = "Nicolas Silva <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.17.0@git:7fea9e934efd8d5dc03b9aa3e06b775c1ac4a23e -> 0.17.0@git:7e0d6c971f900f6a8f01a9de9c41f7894164a82c"

[[audits.wgpu-types]]
who = "Dzmitry Malyshau <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -4238,6 +4258,11 @@ who = "Erich Gubler <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.17.0@git:7c6b85756237f77bfe8d6231dfc7a1412ff662b6 -> 0.17.0@git:332cd0325da52675432830870584ec9766679c34"

[[audits.wgpu-types]]
who = "Nicolas Silva <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.17.0@git:7fea9e934efd8d5dc03b9aa3e06b775c1ac4a23e -> 0.17.0@git:7e0d6c971f900f6a8f01a9de9c41f7894164a82c"

[[audits.whatsys]]
who = "Bobby Holley <[email protected]>"
criteria = "safe-to-deploy"
Expand Down
4 changes: 4 additions & 0 deletions supply-chain/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@ notes = "This was originally servo code which Bobby Holley put on crates.io some
audit-as-crates-io = false
notes = "This is a first-party crate which is also published to crates.io. We certify audits for this crate as part of the documented release process, but that step happens after the version bump lands on central so we don't enforce it here."

[policy.metal]
audit-as-crates-io = true
notes = "Upstream project which we pin."

[policy.midir]
audit-as-crates-io = true
notes = "This is a pinned version of the upstream code, presumably to get a fix that hadn't been released yet. We should consider switching to the latest official release."
Expand Down
Loading

0 comments on commit 5a050d7

Please sign in to comment.