Bug 1950655 - Update wgpu to revision 93f64dc847a0e6788b17b292ae4d7…

…d59361e3be0. r=webgpu-reviewers,ErichDonGubler,supply-chain-reviewers WebGPU CTS run: https://treeherder.mozilla.org/jobs?repo=try&revision=02e0b7243aedb87972250504dd6bf64d74ff3f96 I updated the patch with the expectations from that run. There were some regressions in tier 2: - `testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureStore/cts.https.html.ini` - test path: `webgpu:shader,execution,expression,call,builtin,textureStore:bgra8unorm_swizzle:*` - with error: "Error: Unexpected validation error occurred: Shader module creation failed: Parsing error" - see: https://treeherder.mozilla.org/logviewer?job_id=496834446&repo=try&lineNumber=3089 - `testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/validation/expression/call/builtin/value_constructor/cts.https.html.ini` - new failures related to vector/matrix constructors with abstract types - see: https://treeherder.mozilla.org/logviewer?job_id=496835790&repo=try&lineNumber=2094 There were also a new failures in tier 3 related to abstract types: - `testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/validation/expression/binary/and_or_xor/cts.https.html.ini` - `testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/validation/expression/binary/bitwise_shift/cts.https.html.ini` - `testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/validation/expression/binary/comparison/cts.https.html.ini` - `testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/validation/expression/binary/div_rem/cts.https.html.ini` Overall, there were lots of new passes related to abstract types and I suspect those new failures were actually false positives previously. Limit tests at `testing/web-platform/mozilla/meta/webgpu/cts/webgpu/api/validation/capability_checks/limits/` are as noisy as always... One more try push with all the changes: https://treeherder.mozilla.org/jobs?repo=try&revision=e3b4d3b039ca9e84aa2f4ec0b824c4530f41695d Differential Revision: https://phabricator.services.mozilla.com/D239942
mozilla · Feb 28, 2025 · 5fd69dc · 5fd69dc
1 parent c19cc1a
commit 5fd69dc
Show file tree

Hide file tree

Showing 220 changed files with 2,485 additions and 7,929 deletions.
diff --git a/.cargo/config.toml.in b/.cargo/config.toml.in
@@ -40,9 +40,9 @@ git = "https://github.com/franziskuskiefer/cose-rust"
 rev = "43c22248d136c8b38fe42ea709d08da6355cf04b"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/gfx-rs/wgpu?rev=723abcb1d3d182f9a4bf973f02c6da39a4090f23"]
+[source."git+https://github.com/gfx-rs/wgpu?rev=93f64dc847a0e6788b17b292ae4d7d59361e3be0"]
 git = "https://github.com/gfx-rs/wgpu"
-rev = "723abcb1d3d182f9a4bf973f02c6da39a4090f23"
+rev = "93f64dc847a0e6788b17b292ae4d7d59361e3be0"
 replace-with = "vendored-sources"
 
 [source."git+https://github.com/glandium/rust-objc?rev=4de89f5aa9851ceca4d40e7ac1e2759410c04324"]

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/gfx/wgpu_bindings/Cargo.toml b/gfx/wgpu_bindings/Cargo.toml
@@ -17,7 +17,7 @@ default = []
 [dependencies.wgc]
 package = "wgpu-core"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "723abcb1d3d182f9a4bf973f02c6da39a4090f23"
+rev = "93f64dc847a0e6788b17b292ae4d7d59361e3be0"
 # 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,32 +26,32 @@ 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 = "723abcb1d3d182f9a4bf973f02c6da39a4090f23"
+rev = "93f64dc847a0e6788b17b292ae4d7d59361e3be0"
 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 = "723abcb1d3d182f9a4bf973f02c6da39a4090f23"
+rev = "93f64dc847a0e6788b17b292ae4d7d59361e3be0"
 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 = "723abcb1d3d182f9a4bf973f02c6da39a4090f23"
+rev = "93f64dc847a0e6788b17b292ae4d7d59361e3be0"
 features = ["vulkan"]
 
 [dependencies.wgt]
 package = "wgpu-types"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "723abcb1d3d182f9a4bf973f02c6da39a4090f23"
+rev = "93f64dc847a0e6788b17b292ae4d7d59361e3be0"
 
 [dependencies.wgh]
 package = "wgpu-hal"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "723abcb1d3d182f9a4bf973f02c6da39a4090f23"
+rev = "93f64dc847a0e6788b17b292ae4d7d59361e3be0"
 features = ["oom_panic", "device_lost_panic", "internal_error_panic"]
 
 [target.'cfg(windows)'.dependencies]

diff --git a/gfx/wgpu_bindings/moz.yaml b/gfx/wgpu_bindings/moz.yaml
@@ -20,11 +20,11 @@ origin:
 
   # Human-readable identifier for this version/release
   # Generally "version NNN", "tag SSS", "bookmark SSS"
-  release: 723abcb1d3d182f9a4bf973f02c6da39a4090f23 (2025-02-14T23:38:55Z).
+  release: commit 93f64dc847a0e6788b17b292ae4d7d59361e3be0
 
   # Revision to pull in
   # Must be a long or short commit SHA (long preferred)
-  revision: 723abcb1d3d182f9a4bf973f02c6da39a4090f23
+  revision: 93f64dc847a0e6788b17b292ae4d7d59361e3be0
 
   license: ['MIT', 'Apache-2.0']
 

diff --git a/gfx/wgpu_bindings/src/command.rs b/gfx/wgpu_bindings/src/command.rs
@@ -721,7 +721,7 @@ pub fn replay_render_pass(
     src_pass: &RecordedRenderPass,
     mut error_buf: crate::error::ErrorBuffer,
 ) {
-    let (mut dst_pass, err) = global.command_encoder_create_render_pass(
+    let (mut dst_pass, err) = global.command_encoder_begin_render_pass(
         id,
         &wgc::command::RenderPassDescriptor {
             label: src_pass.base.label.as_ref().map(|s| s.as_str().into()),
@@ -925,7 +925,7 @@ pub fn replay_compute_pass(
     src_pass: &RecordedComputePass,
     mut error_buf: crate::error::ErrorBuffer,
 ) {
-    let (mut dst_pass, err) = global.command_encoder_create_compute_pass(
+    let (mut dst_pass, err) = global.command_encoder_begin_compute_pass(
         id,
         &wgc::command::ComputePassDescriptor {
             label: src_pass.base.label.as_ref().map(|s| s.as_str().into()),

diff --git a/gfx/wgpu_bindings/src/server.rs b/gfx/wgpu_bindings/src/server.rs
@@ -137,6 +137,7 @@ pub extern "C" fn wgpu_server_new(owner: *mut c_void, use_dxc: bool) -> *mut Glo
         wgt::Dx12Compiler::DynamicDxc {
             dxc_path: "dxcompiler.dll".into(),
             dxil_path: "dxil.dll".into(),
+            max_shader_model: wgt::DxcShaderModel::V6_6
         }
     } else {
         wgt::Dx12Compiler::Fxc

diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
@@ -1903,6 +1903,11 @@ who = "Erich Gubler <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.2.9 -> 0.2.10"
 
+[[audits.document-features]]
+who = "Teodor Tanasoaia <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.2.10 -> 0.2.11"
+
 [[audits.dogear]]
 who = "Sammy Khamis <[email protected]>"
 criteria = "safe-to-deploy"
@@ -3578,9 +3583,9 @@ criteria = "safe-to-deploy"
 delta = "23.1.0 -> 24.0.0"
 
 [[audits.naga]]
-who = "Erich Gubler <erichdongubler@gmail.com>"
+who = "Teodor Tanasoaia <ttanasoaia@mozilla.com>"
 criteria = "safe-to-deploy"
-delta = "24.0.0 -> 24.0.0@git:723abcb1d3d182f9a4bf973f02c6da39a4090f23"
+delta = "24.0.0 -> 24.0.0@git:93f64dc847a0e6788b17b292ae4d7d59361e3be0"
 importable = false
 
 [[audits.net2]]
@@ -5754,9 +5759,9 @@ criteria = "safe-to-deploy"
 delta = "23.0.1 -> 24.0.0"
 
 [[audits.wgpu-core]]
-who = "Erich Gubler <erichdongubler@gmail.com>"
+who = "Teodor Tanasoaia <ttanasoaia@mozilla.com>"
 criteria = "safe-to-deploy"
-delta = "24.0.0 -> 24.0.0@git:723abcb1d3d182f9a4bf973f02c6da39a4090f23"
+delta = "24.0.0 -> 24.0.0@git:93f64dc847a0e6788b17b292ae4d7d59361e3be0"
 importable = false
 
 [[audits.wgpu-hal]]
@@ -5838,9 +5843,9 @@ criteria = "safe-to-deploy"
 delta = "23.0.1 -> 24.0.0"
 
 [[audits.wgpu-hal]]
-who = "Erich Gubler <erichdongubler@gmail.com>"
+who = "Teodor Tanasoaia <ttanasoaia@mozilla.com>"
 criteria = "safe-to-deploy"
-delta = "24.0.0 -> 24.0.0@git:723abcb1d3d182f9a4bf973f02c6da39a4090f23"
+delta = "24.0.0 -> 24.0.0@git:93f64dc847a0e6788b17b292ae4d7d59361e3be0"
 importable = false
 
 [[audits.wgpu-types]]
@@ -5917,9 +5922,9 @@ criteria = "safe-to-deploy"
 delta = "23.0.0 -> 24.0.0"
 
 [[audits.wgpu-types]]
-who = "Erich Gubler <erichdongubler@gmail.com>"
+who = "Teodor Tanasoaia <ttanasoaia@mozilla.com>"
 criteria = "safe-to-deploy"
-delta = "24.0.0 -> 24.0.0@git:723abcb1d3d182f9a4bf973f02c6da39a4090f23"
+delta = "24.0.0 -> 24.0.0@git:93f64dc847a0e6788b17b292ae4d7d59361e3be0"
 importable = false
 
 [[audits.whatsys]]

diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
@@ -592,8 +592,8 @@ user-login = "Amanieu"
 user-name = "Amanieu d'Antras"
 
 [[publisher.serde]]
-version = "1.0.217"
-when = "2024-12-27"
+version = "1.0.218"
+when = "2025-02-20"
 user-id = 3618
 user-login = "dtolnay"
 user-name = "David Tolnay"
@@ -606,8 +606,8 @@ user-login = "dtolnay"
 user-name = "David Tolnay"
 
 [[publisher.serde_derive]]
-version = "1.0.217"
-when = "2024-12-27"
+version = "1.0.218"
+when = "2025-02-20"
 user-id = 3618
 user-login = "dtolnay"
 user-name = "David Tolnay"
@@ -710,13 +710,6 @@ user-id = 1139
 user-login = "Manishearth"
 user-name = "Manish Goregaokar"
 
-[[publisher.unicode-xid]]
-version = "0.2.4"
-when = "2022-09-15"
-user-id = 1139
-user-login = "Manishearth"
-user-name = "Manish Goregaokar"
-
 [[publisher.uniffi]]
 version = "0.28.2"
 when = "2024-10-08"

diff --git a/...webgpu/api/validation/capability_checks/limits/maxBindingsPerBindGroup/cts.https.html.ini b/...webgpu/api/validation/capability_checks/limits/maxBindingsPerBindGroup/cts.https.html.ini
@@ -24,10 +24,7 @@
 [cts.https.html?q=webgpu:api,validation,capability_checks,limits,maxBindingsPerBindGroup:createPipeline,at_over:*]
   tags: [webgpu, webgpu-long]
   implementation-status: backlog
-  expected:
-    if os == "win": [OK, CRASH]
-    if os == "linux": [OK, CRASH]
-    if os == "mac": [OK, CRASH]
+  expected: [OK, CRASH]
   [:limitTest="atDefault";testValueName="atLimit";createPipelineType="createComputePipeline";async=false]
 
   [:limitTest="atDefault";testValueName="atLimit";createPipelineType="createComputePipeline";async=true]

diff --git a/...la/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/all/cts.https.html.ini b/...la/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/all/cts.https.html.ini
@@ -1,15 +1,13 @@
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,all:bool:*]
-  implementation-status: backlog
+  implementation-status:
+    if os == "mac": backlog
   [:inputSource="const";overload="scalar"]
 
   [:inputSource="const";overload="vec2"]
-    expected: FAIL
 
   [:inputSource="const";overload="vec3"]
-    expected: FAIL
 
   [:inputSource="const";overload="vec4"]
-    expected: FAIL
 
   [:inputSource="storage_r";overload="scalar"]
 

diff --git a/...la/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/any/cts.https.html.ini b/...la/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/any/cts.https.html.ini
@@ -1,15 +1,13 @@
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,any:bool:*]
-  implementation-status: backlog
+  implementation-status:
+    if os == "mac": backlog
   [:inputSource="const";overload="scalar"]
 
   [:inputSource="const";overload="vec2"]
-    expected: FAIL
 
   [:inputSource="const";overload="vec3"]
-    expected: FAIL
 
   [:inputSource="const";overload="vec4"]
-    expected: FAIL
 
   [:inputSource="storage_r";overload="scalar"]