From 3c3b6cfdc4ec9ac4b3833f5b08207f70ece1bd93 Mon Sep 17 00:00:00 2001 From: Samson <16504129+sagudev@users.noreply.github.com> Date: Mon, 24 Feb 2025 21:27:36 +0100 Subject: [PATCH] chore: Update wgpu (#35639) * Update wgpu https://github.com/gfx-rs/wgpu/commit/2f255edc60e9669c8c737464c59af10d59a31126 Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> * Update expectations Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> --------- Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> --- Cargo.lock | 36 +++++++++++++-- Cargo.toml | 4 +- components/webgpu/wgpu_thread.rs | 4 +- .../wpt/webgpu/meta/webgpu/cts.https.html.ini | 46 ------------------- 4 files changed, 35 insertions(+), 55 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d301f693843..fd24727c3f5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4745,7 +4745,7 @@ checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" [[package]] name = "naga" version = "24.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=d8833d079833c62b4fd00325d0ba08ec0c8bc309#d8833d079833c62b4fd00325d0ba08ec0c8bc309" +source = "git+https://github.com/gfx-rs/wgpu?rev=2f255edc60e9669c8c737464c59af10d59a31126#2f255edc60e9669c8c737464c59af10d59a31126" dependencies = [ "arrayvec", "bit-set", @@ -8656,7 +8656,7 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu-core" version = "24.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=d8833d079833c62b4fd00325d0ba08ec0c8bc309#d8833d079833c62b4fd00325d0ba08ec0c8bc309" +source = "git+https://github.com/gfx-rs/wgpu?rev=2f255edc60e9669c8c737464c59af10d59a31126#2f255edc60e9669c8c737464c59af10d59a31126" dependencies = [ "arrayvec", "bit-vec", @@ -8674,14 +8674,41 @@ dependencies = [ "serde", "smallvec", "thiserror 2.0.9", + "wgpu-core-deps-apple", + "wgpu-core-deps-emscripten", + "wgpu-core-deps-windows-linux-android", "wgpu-hal", "wgpu-types", ] +[[package]] +name = "wgpu-core-deps-apple" +version = "24.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=2f255edc60e9669c8c737464c59af10d59a31126#2f255edc60e9669c8c737464c59af10d59a31126" +dependencies = [ + "wgpu-hal", +] + +[[package]] +name = "wgpu-core-deps-emscripten" +version = "24.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=2f255edc60e9669c8c737464c59af10d59a31126#2f255edc60e9669c8c737464c59af10d59a31126" +dependencies = [ + "wgpu-hal", +] + +[[package]] +name = "wgpu-core-deps-windows-linux-android" +version = "24.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=2f255edc60e9669c8c737464c59af10d59a31126#2f255edc60e9669c8c737464c59af10d59a31126" +dependencies = [ + "wgpu-hal", +] + [[package]] name = "wgpu-hal" version = "24.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=d8833d079833c62b4fd00325d0ba08ec0c8bc309#d8833d079833c62b4fd00325d0ba08ec0c8bc309" +source = "git+https://github.com/gfx-rs/wgpu?rev=2f255edc60e9669c8c737464c59af10d59a31126#2f255edc60e9669c8c737464c59af10d59a31126" dependencies = [ "android_system_properties", "arrayvec", @@ -8713,7 +8740,6 @@ dependencies = [ "profiling", "range-alloc", "raw-window-handle", - "rustc-hash 1.1.0", "smallvec", "thiserror 2.0.9", "wasm-bindgen", @@ -8726,7 +8752,7 @@ dependencies = [ [[package]] name = "wgpu-types" version = "24.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=d8833d079833c62b4fd00325d0ba08ec0c8bc309#d8833d079833c62b4fd00325d0ba08ec0c8bc309" +source = "git+https://github.com/gfx-rs/wgpu?rev=2f255edc60e9669c8c737464c59af10d59a31126#2f255edc60e9669c8c737464c59af10d59a31126" dependencies = [ "bitflags 2.8.0", "js-sys", diff --git a/Cargo.toml b/Cargo.toml index a6a5499b675..b698ff1071c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -164,8 +164,8 @@ webrender = { git = "https://github.com/servo/webrender", branch = "0.66", featu webrender_api = { git = "https://github.com/servo/webrender", branch = "0.66" } webrender_traits = { path = "components/shared/webrender" } webxr-api = { path = "components/shared/webxr" } -wgpu-core = { git = "https://github.com/gfx-rs/wgpu", rev = "d8833d079833c62b4fd00325d0ba08ec0c8bc309" } -wgpu-types = { git = "https://github.com/gfx-rs/wgpu", rev = "d8833d079833c62b4fd00325d0ba08ec0c8bc309" } +wgpu-core = { git = "https://github.com/gfx-rs/wgpu", rev = "2f255edc60e9669c8c737464c59af10d59a31126" } +wgpu-types = { git = "https://github.com/gfx-rs/wgpu", rev = "2f255edc60e9669c8c737464c59af10d59a31126" } winapi = "0.3" windows-sys = "0.59" wio = "0.2" diff --git a/components/webgpu/wgpu_thread.rs b/components/webgpu/wgpu_thread.rs index 63b7825723c..a6917c89c32 100644 --- a/components/webgpu/wgpu_thread.rs +++ b/components/webgpu/wgpu_thread.rs @@ -754,7 +754,7 @@ impl WGPU { device_id: _device_id, } => { let global = &self.global; - let (pass, error) = global.command_encoder_create_compute_pass( + let (pass, error) = global.command_encoder_begin_compute_pass( command_encoder_id, &ComputePassDescriptor { label, @@ -908,7 +908,7 @@ impl WGPU { occlusion_query_set: None, }; let (pass, error) = - global.command_encoder_create_render_pass(command_encoder_id, desc); + global.command_encoder_begin_render_pass(command_encoder_id, desc); assert!( self.render_passes .insert(render_pass_id, Pass::new(pass, error.is_none())) diff --git a/tests/wpt/webgpu/meta/webgpu/cts.https.html.ini b/tests/wpt/webgpu/meta/webgpu/cts.https.html.ini index 592ac751cc7..f7a0246317a 100644 --- a/tests/wpt/webgpu/meta/webgpu/cts.https.html.ini +++ b/tests/wpt/webgpu/meta/webgpu/cts.https.html.ini @@ -30613,8 +30613,6 @@ [cts.https.html?q=webgpu:api,validation,encoding,cmds,copyTextureToTexture:sample_count:*] [:] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:api,validation,encoding,cmds,copyTextureToTexture:texture,device_mismatch:*] @@ -89727,16 +89725,10 @@ [:inputSource="const";overload="scalar"] [:inputSource="const";overload="vec2"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="const";overload="vec3"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="const";overload="vec4"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";overload="scalar"] @@ -89767,16 +89759,10 @@ [:inputSource="const";overload="scalar"] [:inputSource="const";overload="vec2"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="const";overload="vec3"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="const";overload="vec4"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";overload="scalar"] @@ -444861,12 +444847,8 @@ if os == "linux" and not debug: FAIL [:case="runtime_array_const_oob_neg"] - expected: - if os == "linux" and not debug: FAIL [:case="runtime_array_override_oob_neg"] - expected: - if os == "linux" and not debug: FAIL [:case="runtime_in_bounds"] expected: @@ -456363,8 +456345,6 @@ [:type="vec2%3Cabstract-int%3E"] [:type="vec2%3Cbool%3E"] - expected: - if os == "linux" and not debug: FAIL [:type="vec2%3Cf16%3E"] @@ -456379,8 +456359,6 @@ [:type="vec3%3Cabstract-int%3E"] [:type="vec3%3Cbool%3E"] - expected: - if os == "linux" and not debug: FAIL [:type="vec3%3Cf16%3E"] @@ -456395,8 +456373,6 @@ [:type="vec4%3Cabstract-int%3E"] [:type="vec4%3Cbool%3E"] - expected: - if os == "linux" and not debug: FAIL [:type="vec4%3Cf16%3E"] @@ -456491,8 +456467,6 @@ [:type="vec2%3Cabstract-int%3E"] [:type="vec2%3Cbool%3E"] - expected: - if os == "linux" and not debug: FAIL [:type="vec2%3Cf16%3E"] @@ -456507,8 +456481,6 @@ [:type="vec3%3Cabstract-int%3E"] [:type="vec3%3Cbool%3E"] - expected: - if os == "linux" and not debug: FAIL [:type="vec3%3Cf16%3E"] @@ -456523,8 +456495,6 @@ [:type="vec4%3Cabstract-int%3E"] [:type="vec4%3Cbool%3E"] - expected: - if os == "linux" and not debug: FAIL [:type="vec4%3Cf16%3E"] @@ -518009,16 +517979,10 @@ [:case="array_absint_to_u32"] [:case="mat2x2_index_absfloat"] - expected: - if os == "linux" and not debug: FAIL [:case="mat2x2_index_absint"] - expected: - if os == "linux" and not debug: FAIL [:case="mat2x2_index_float"] - expected: - if os == "linux" and not debug: FAIL [:case="mat2x2_wrong_result"] @@ -518027,8 +517991,6 @@ [:case="vector_absfloat_to_f16"] [:case="vector_absfloat_to_f32"] - expected: - if os == "linux" and not debug: FAIL [:case="vector_absfloat_to_i32"] @@ -518039,20 +518001,12 @@ [:case="vector_absint_to_f16"] [:case="vector_absint_to_f32"] - expected: - if os == "linux" and not debug: FAIL [:case="vector_absint_to_i32"] - expected: - if os == "linux" and not debug: FAIL [:case="vector_absint_to_u32"] - expected: - if os == "linux" and not debug: FAIL [:case="vector_abstract_to_integer"] - expected: - if os == "linux" and not debug: FAIL [:case="vector_default_ctor_abstract"] expected: