Bug 1943149 - build(webgpu): update WGPU to db896a86d0db0637149d7012bd865059f8783ec3 r=#webgpu-reviewers!

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

Author: ErichDonGubler

.cargo/config.toml.in

@@ -40,14 +40,9 @@ git = "https://github.com/franziskuskiefer/cose-rust"
 rev = "43c22248d136c8b38fe42ea709d08da6355cf04b"
 replace-with = "vendored-sources"
 
-[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"]
+[source."git+https://github.com/gfx-rs/wgpu?rev=db896a86d0db0637149d7012bd865059f8783ec3"]
 git = "https://github.com/gfx-rs/wgpu"
-rev = "aa7bec65b90028e4db6ec8def8589b52097d92f9"
+rev = "db896a86d0db0637149d7012bd865059f8783ec3"
 replace-with = "vendored-sources"
 
 [source."git+https://github.com/glandium/rust-objc?rev=4de89f5aa9851ceca4d40e7ac1e2759410c04324"]

Cargo.lock

@@ -17,7 +17,7 @@ default = []
 [dependencies.wgc]
 package = "wgpu-core"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "aa7bec65b90028e4db6ec8def8589b52097d92f9"
+rev = "db896a86d0db0637149d7012bd865059f8783ec3"
 # 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 = "aa7bec65b90028e4db6ec8def8589b52097d92f9"
+rev = "db896a86d0db0637149d7012bd865059f8783ec3"
 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 = "aa7bec65b90028e4db6ec8def8589b52097d92f9"
+rev = "db896a86d0db0637149d7012bd865059f8783ec3"
 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 = "aa7bec65b90028e4db6ec8def8589b52097d92f9"
+rev = "db896a86d0db0637149d7012bd865059f8783ec3"
 features = ["vulkan"]
 
 [dependencies.wgt]
 package = "wgpu-types"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "aa7bec65b90028e4db6ec8def8589b52097d92f9"
+rev = "db896a86d0db0637149d7012bd865059f8783ec3"
 
 [dependencies.wgh]
 package = "wgpu-hal"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "aa7bec65b90028e4db6ec8def8589b52097d92f9"
+rev = "db896a86d0db0637149d7012bd865059f8783ec3"
 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 = { version = "0.30", git = "https://github.com/gfx-rs/metal-rs.git", rev = "ef768ff9d7" }
+metal = "0.31"
 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: commit aa7bec65b90028e4db6ec8def8589b52097d92f9
+  release: db896a86d0db0637149d7012bd865059f8783ec3 (2025-02-07T04:10:28Z).
 
   # Revision to pull in
   # Must be a long or short commit SHA (long preferred)
-  revision: aa7bec65b90028e4db6ec8def8589b52097d92f9
+  revision: db896a86d0db0637149d7012bd865059f8783ec3
 
   license: ['MIT', 'Apache-2.0']
 

gfx/wgpu_bindings/moz.yaml

@@ -125,7 +125,7 @@ pub extern "C" fn wgpu_server_new(owner: *mut c_void, use_dxc: bool) -> *mut Glo
             "Selecting backends based on dom.webgpu.wgpu-backend pref: {:?}",
             backends_pref
         );
-        wgc::instance::parse_backends_from_comma_list(&backends_pref)
+        wgt::Backends::from_comma_list(&backends_pref)
     };
 
     let mut instance_flags = wgt::InstanceFlags::from_build_config().with_env();
@@ -147,8 +147,15 @@ pub extern "C" fn wgpu_server_new(owner: *mut c_void, use_dxc: bool) -> *mut Glo
         &wgt::InstanceDescriptor {
             backends,
             flags: instance_flags,
-            dx12_shader_compiler,
-            gles_minor_version: wgt::Gles3MinorVersion::Automatic,
+            backend_options: wgt::BackendOptions {
+                gl: wgt::GlBackendOptions {
+                    gles_minor_version: wgt::Gles3MinorVersion::Automatic,
+                    short_circuit_fences: wgt::GlFenceBehavior::Normal,
+                },
+                dx12: wgt::Dx12BackendOptions {
+                    shader_compiler: dx12_shader_compiler,
+                },
+            },
         },
     );
     let global = Global { global, owner };
@@ -410,9 +417,7 @@ pub unsafe extern "C" fn wgpu_server_adapter_request_device(
 
         path
     });
-    let trace_path = trace_string
-        .as_ref()
-        .map(|string| std::path::Path::new(string.as_str()));
+    let trace_path = trace_string.as_deref();
     // TODO: in https://github.com/gfx-rs/wgpu/pull/3626/files#diff-033343814319f5a6bd781494692ea626f06f6c3acc0753a12c867b53a646c34eR97
     // which introduced the queue id parameter, the queue id is also the device id. I don't know how applicable this is to
     // other situations (this one in particular).
@@ -1797,7 +1802,7 @@ impl Global {
             sample_count: desc.sample_count,
             dimension: desc.dimension,
             format: desc.format,
-            usage: wgh::TextureUses::COPY_DST | wgh::TextureUses::COLOR_TARGET,
+            usage: wgt::TextureUses::COPY_DST | wgt::TextureUses::COLOR_TARGET,
             memory_flags: wgh::MemoryFlags::empty(),
             view_formats: vec![],
         };

gfx/wgpu_bindings/src/server.rs

@@ -3451,24 +3451,20 @@ criteria = "safe-to-deploy"
 delta = "22.0.0 -> 23.0.0"
 
 [[audits.naga]]
-who = [
-    "Jim Blandy <jimb@red-bean.com>",
-    "Erich Gubler <erichdongubler@gmail.com>",
-    "Teodor Tanasoaia <ttanasoaia@mozilla.com>",
-]
+who = "Erich Gubler <erichdongubler@gmail.com>"
 criteria = "safe-to-deploy"
-delta = "23.0.0 -> 23.0.0@git:aa7bec65b90028e4db6ec8def8589b52097d92f9"
-importable = false
+delta = "23.0.0 -> 23.1.0"
 
 [[audits.naga]]
 who = "Erich Gubler <erichdongubler@gmail.com>"
 criteria = "safe-to-deploy"
-delta = "23.0.0 -> 23.1.0"
+delta = "23.1.0 -> 24.0.0"
 
 [[audits.naga]]
 who = "Erich Gubler <erichdongubler@gmail.com>"
 criteria = "safe-to-deploy"
-delta = "23.1.0 -> 24.0.0"
+delta = "24.0.0 -> 24.0.0@git:db896a86d0db0637149d7012bd865059f8783ec3"
+importable = false
 
 [[audits.net2]]
 who = "Mike Hommey <mh+mozilla@glandium.org>"
@@ -5626,19 +5622,15 @@ criteria = "safe-to-deploy"
 delta = "23.0.0 -> 23.0.1"
 
 [[audits.wgpu-core]]
-who = [
-    "Jim Blandy <jimb@red-bean.com>",
-    "Erich Gubler <erichdongubler@gmail.com>",
-    "Teodor Tanasoaia <ttanasoaia@mozilla.com>",
-]
+who = "Erich Gubler <erichdongubler@gmail.com>"
 criteria = "safe-to-deploy"
-delta = "23.0.1 -> 23.0.1@git:aa7bec65b90028e4db6ec8def8589b52097d92f9"
-importable = false
+delta = "23.0.1 -> 24.0.0"
 
 [[audits.wgpu-core]]
 who = "Erich Gubler <erichdongubler@gmail.com>"
 criteria = "safe-to-deploy"
-delta = "23.0.1 -> 24.0.0"
+delta = "24.0.0 -> 24.0.0@git:db896a86d0db0637149d7012bd865059f8783ec3"
+importable = false
 
 [[audits.wgpu-hal]]
 who = "Dzmitry Malyshau <kvark@fastmail.com>"
@@ -5714,19 +5706,15 @@ criteria = "safe-to-deploy"
 delta = "23.0.0 -> 23.0.1"
 
 [[audits.wgpu-hal]]
-who = [
-    "Jim Blandy <jimb@red-bean.com>",
-    "Erich Gubler <erichdongubler@gmail.com>",
-    "Teodor Tanasoaia <ttanasoaia@mozilla.com>",
-]
+who = "Erich Gubler <erichdongubler@gmail.com>"
 criteria = "safe-to-deploy"
-delta = "23.0.1 -> 23.0.1@git:aa7bec65b90028e4db6ec8def8589b52097d92f9"
-importable = false
+delta = "23.0.1 -> 24.0.0"
 
 [[audits.wgpu-hal]]
 who = "Erich Gubler <erichdongubler@gmail.com>"
 criteria = "safe-to-deploy"
-delta = "23.0.1 -> 24.0.0"
+delta = "24.0.0 -> 24.0.0@git:db896a86d0db0637149d7012bd865059f8783ec3"
+importable = false
 
 [[audits.wgpu-types]]
 who = "Dzmitry Malyshau <kvark@fastmail.com>"
@@ -5797,19 +5785,15 @@ criteria = "safe-to-deploy"
 delta = "22.0.0 -> 23.0.0"
 
 [[audits.wgpu-types]]
-who = [
-    "Jim Blandy <jimb@red-bean.com>",
-    "Erich Gubler <erichdongubler@gmail.com>",
-    "Teodor Tanasoaia <ttanasoaia@mozilla.com>",
-]
+who = "Erich Gubler <erichdongubler@gmail.com>"
 criteria = "safe-to-deploy"
-delta = "23.0.0 -> 23.0.0@git:aa7bec65b90028e4db6ec8def8589b52097d92f9"
-importable = false
+delta = "23.0.0 -> 24.0.0"
 
 [[audits.wgpu-types]]
 who = "Erich Gubler <erichdongubler@gmail.com>"
 criteria = "safe-to-deploy"
-delta = "23.0.0 -> 24.0.0"
+delta = "24.0.0 -> 24.0.0@git:db896a86d0db0637149d7012bd865059f8783ec3"
+importable = false
 
 [[audits.whatsys]]
 who = "Bobby Holley <bobbyholley@gmail.com>"

supply-chain/audits.toml

@@ -103,10 +103,6 @@ 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."