Bug 1941540 - Update wgpu to revision aa7bec65b90028e4db6ec8def8589b52097d92f9. r=webgpu-reviewers,glandium,supply-chain-reviewers,ErichDonGubler,nical

Differential Revision: https://phabricator.services.mozilla.com/D234312

Author: teoxoy

.cargo/config.toml.in

@@ -40,9 +40,14 @@ git = "https://github.com/franziskuskiefer/cose-rust"
 rev = "43c22248d136c8b38fe42ea709d08da6355cf04b"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/gfx-rs/wgpu?rev=15a77b525c6dc76b39b8bd191d0ddfe21ddbcef6"]
+[source."git+https://github.com/gfx-rs/metal-rs.git?rev=ef768ff9d7"]
+git = "https://github.com/gfx-rs/metal-rs.git"
+rev = "ef768ff9d7"
+replace-with = "vendored-sources"
+
+[source."git+https://github.com/gfx-rs/wgpu?rev=aa7bec65b90028e4db6ec8def8589b52097d92f9"]
 git = "https://github.com/gfx-rs/wgpu"
-rev = "15a77b525c6dc76b39b8bd191d0ddfe21ddbcef6"
+rev = "aa7bec65b90028e4db6ec8def8589b52097d92f9"
 replace-with = "vendored-sources"
 
 [source."git+https://github.com/glandium/rust-objc?rev=4de89f5aa9851ceca4d40e7ac1e2759410c04324"]

Cargo.lock

@@ -6,3 +6,7 @@ license = "MIT OR Apache-2.0"
 
 [lib]
 path = "lib.rs"
+
+[features]
+default = ["std"]
+std = []

build/rust/dummy-web/js-sys/Cargo.toml

@@ -9,6 +9,8 @@ path = "lib.rs"
 
 # This list is taken from web-sys 0.3.70's Cargo.toml
 [features]
+default = ["std"]
+std = []
 AbortController = []
 AbortSignal = ["EventTarget"]
 AddEventListenerOptions = []

build/rust/dummy-web/web-sys/Cargo.toml

@@ -38,11 +38,11 @@
         is(
           message,
           `
-Shader '' parsing error: expected global item ('struct', 'const', 'var', 'alias', ';', 'fn') or the end of the file, found '?'
+Shader '' parsing error: expected global item (\`struct\`, \`const\`, \`var\`, \`alias\`, \`fn\`, \`diagnostic\`, \`enable\`, \`requires\`, \`;\`) or the end of the file, found "?"
   ┌─ wgsl:1:12
   │
 1 │ /*🐈🐈🐈🐈🐈🐈🐈*/?
-  │                   ^ expected global item ('struct', 'const', 'var', 'alias', ';', 'fn') or the end of the file
+  │                   ^ expected global item (\`struct\`, \`const\`, \`var\`, \`alias\`, \`fn\`, \`diagnostic\`, \`enable\`, \`requires\`, \`;\`) or the end of the file
 
 `
         );

dom/webgpu/mochitest/test_compilation_message_pos.html

@@ -17,7 +17,7 @@ default = []
 [dependencies.wgc]
 package = "wgpu-core"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "15a77b525c6dc76b39b8bd191d0ddfe21ddbcef6"
+rev = "aa7bec65b90028e4db6ec8def8589b52097d92f9"
 # TODO: remove the replay feature on the next update containing https://github.com/gfx-rs/wgpu/pull/5182
 features = ["serde", "replay", "trace", "strict_asserts", "wgsl", "api_log_info", "indirect-validation"]
 
@@ -26,40 +26,40 @@ features = ["serde", "replay", "trace", "strict_asserts", "wgsl", "api_log_info"
 [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies.wgc]
 package = "wgpu-core"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "15a77b525c6dc76b39b8bd191d0ddfe21ddbcef6"
+rev = "aa7bec65b90028e4db6ec8def8589b52097d92f9"
 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 = "15a77b525c6dc76b39b8bd191d0ddfe21ddbcef6"
+rev = "aa7bec65b90028e4db6ec8def8589b52097d92f9"
 features = ["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 = "15a77b525c6dc76b39b8bd191d0ddfe21ddbcef6"
+rev = "aa7bec65b90028e4db6ec8def8589b52097d92f9"
 features = ["vulkan"]
 
 [dependencies.wgt]
 package = "wgpu-types"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "15a77b525c6dc76b39b8bd191d0ddfe21ddbcef6"
+rev = "aa7bec65b90028e4db6ec8def8589b52097d92f9"
 
 [dependencies.wgh]
 package = "wgpu-hal"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "15a77b525c6dc76b39b8bd191d0ddfe21ddbcef6"
+rev = "aa7bec65b90028e4db6ec8def8589b52097d92f9"
 features = ["oom_panic", "device_lost_panic", "internal_error_panic"]
 
 [target.'cfg(windows)'.dependencies]
 windows = { version = "0.58", default-features = false, features = ["Win32_Graphics_Direct3D12"]}
 
 [target.'cfg(target_os = "macos")'.dependencies]
 objc = "0.2"
-metal = "0.30"
+metal = { version = "0.30", git = "https://github.com/gfx-rs/metal-rs.git", rev = "ef768ff9d7" }
 io-surface = "0.15"
 
 [dependencies]

gfx/wgpu_bindings/Cargo.toml

@@ -20,11 +20,11 @@ origin:
 
   # Human-readable identifier for this version/release
   # Generally "version NNN", "tag SSS", "bookmark SSS"
-  release: 15a77b525c6dc76b39b8bd191d0ddfe21ddbcef6 (2025-01-03T00:48:54Z).
+  release: commit aa7bec65b90028e4db6ec8def8589b52097d92f9
 
   # Revision to pull in
   # Must be a long or short commit SHA (long preferred)
-  revision: 15a77b525c6dc76b39b8bd191d0ddfe21ddbcef6
+  revision: aa7bec65b90028e4db6ec8def8589b52097d92f9
 
   license: ['MIT', 'Apache-2.0']
 

gfx/wgpu_bindings/moz.yaml

@@ -144,7 +144,7 @@ pub extern "C" fn wgpu_server_new(owner: *mut c_void, use_dxc: bool) -> *mut Glo
 
     let global = wgc::global::Global::new(
         "wgpu",
-        wgt::InstanceDescriptor {
+        &wgt::InstanceDescriptor {
             backends,
             flags: instance_flags,
             dx12_shader_compiler,

gfx/wgpu_bindings/src/server.rs

@@ -3154,6 +3154,11 @@ who = "Erich Gubler <erichdongubler@gmail.com>"
 criteria = "safe-to-deploy"
 delta = "0.29.0 -> 0.30.0"
 
+[[audits.metal]]
+who = "Teodor Tanasoaia <ttanasoaia@mozilla.com>"
+criteria = "safe-to-deploy"
+delta = "0.30.0 -> 0.30.0@git:ef768ff9d742ae6a0f4e83ddc8031264e7d460c4"
+
 [[audits.midir]]
 who = "Bobby Holley <bobbyholley@gmail.com>"
 criteria = "safe-to-deploy"
@@ -3418,11 +3423,11 @@ delta = "22.0.0 -> 23.0.0"
 [[audits.naga]]
 who = [
     "Jim Blandy <jimb@red-bean.com>",
-    "Teodor Tanasoaia <ttanasoaia@mozilla.com>",
     "Erich Gubler <erichdongubler@gmail.com>",
+    "Teodor Tanasoaia <ttanasoaia@mozilla.com>",
 ]
 criteria = "safe-to-deploy"
-delta = "23.0.0 -> 23.0.0@git:15a77b525c6dc76b39b8bd191d0ddfe21ddbcef6"
+delta = "23.0.0 -> 23.0.0@git:aa7bec65b90028e4db6ec8def8589b52097d92f9"
 importable = false
 
 [[audits.net2]]
@@ -4619,6 +4624,16 @@ who = "Ben Dean-Kawamura <bdk@mozilla.com>"
 criteria = "safe-to-deploy"
 delta = "0.10.0 -> 0.11.1"
 
+[[audits.strum]]
+who = "Teodor Tanasoaia <ttanasoaia@mozilla.com>"
+criteria = "safe-to-deploy"
+delta = "0.25.0 -> 0.26.3"
+
+[[audits.strum_macros]]
+who = "Teodor Tanasoaia <ttanasoaia@mozilla.com>"
+criteria = "safe-to-deploy"
+delta = "0.25.3 -> 0.26.4"
+
 [[audits.subtle]]
 who = "Simon Friedberger <simon@mozilla.com>"
 criteria = "safe-to-deploy"
@@ -5568,11 +5583,11 @@ delta = "23.0.0 -> 23.0.1"
 [[audits.wgpu-core]]
 who = [
     "Jim Blandy <jimb@red-bean.com>",
-    "Teodor Tanasoaia <ttanasoaia@mozilla.com>",
     "Erich Gubler <erichdongubler@gmail.com>",
+    "Teodor Tanasoaia <ttanasoaia@mozilla.com>",
 ]
 criteria = "safe-to-deploy"
-delta = "23.0.1 -> 23.0.1@git:15a77b525c6dc76b39b8bd191d0ddfe21ddbcef6"
+delta = "23.0.1 -> 23.0.1@git:aa7bec65b90028e4db6ec8def8589b52097d92f9"
 importable = false
 
 [[audits.wgpu-hal]]
@@ -5651,11 +5666,11 @@ delta = "23.0.0 -> 23.0.1"
 [[audits.wgpu-hal]]
 who = [
     "Jim Blandy <jimb@red-bean.com>",
-    "Teodor Tanasoaia <ttanasoaia@mozilla.com>",
     "Erich Gubler <erichdongubler@gmail.com>",
+    "Teodor Tanasoaia <ttanasoaia@mozilla.com>",
 ]
 criteria = "safe-to-deploy"
-delta = "23.0.1 -> 23.0.1@git:15a77b525c6dc76b39b8bd191d0ddfe21ddbcef6"
+delta = "23.0.1 -> 23.0.1@git:aa7bec65b90028e4db6ec8def8589b52097d92f9"
 importable = false
 
 [[audits.wgpu-types]]
@@ -5729,11 +5744,11 @@ delta = "22.0.0 -> 23.0.0"
 [[audits.wgpu-types]]
 who = [
     "Jim Blandy <jimb@red-bean.com>",
-    "Teodor Tanasoaia <ttanasoaia@mozilla.com>",
     "Erich Gubler <erichdongubler@gmail.com>",
+    "Teodor Tanasoaia <ttanasoaia@mozilla.com>",
 ]
 criteria = "safe-to-deploy"
-delta = "23.0.0 -> 23.0.0@git:15a77b525c6dc76b39b8bd191d0ddfe21ddbcef6"
+delta = "23.0.0 -> 23.0.0@git:aa7bec65b90028e4db6ec8def8589b52097d92f9"
 importable = false
 
 [[audits.whatsys]]

supply-chain/audits.toml

@@ -103,6 +103,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 = "wgpu-hal pins this crate."
+
 [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."