diff --git a/Cargo.lock b/Cargo.lock index d559e321bc8..dc1e4db758c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4599,7 +4599,7 @@ checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" [[package]] name = "naga" version = "24.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=779261e64daa6cf76c826532b7a1561d8ec203fd#779261e64daa6cf76c826532b7a1561d8ec203fd" +source = "git+https://github.com/gfx-rs/wgpu?rev=d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6#d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6" dependencies = [ "arrayvec", "bit-set", @@ -8497,13 +8497,14 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu-core" version = "24.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=779261e64daa6cf76c826532b7a1561d8ec203fd#779261e64daa6cf76c826532b7a1561d8ec203fd" +source = "git+https://github.com/gfx-rs/wgpu?rev=d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6#d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6" dependencies = [ "arrayvec", "bit-vec", "bitflags 2.8.0", "cfg_aliases", "document-features", + "hashbrown", "indexmap", "log", "naga", @@ -8521,7 +8522,7 @@ dependencies = [ [[package]] name = "wgpu-hal" version = "24.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=779261e64daa6cf76c826532b7a1561d8ec203fd#779261e64daa6cf76c826532b7a1561d8ec203fd" +source = "git+https://github.com/gfx-rs/wgpu?rev=d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6#d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6" dependencies = [ "android_system_properties", "arrayvec", @@ -8537,6 +8538,7 @@ dependencies = [ "gpu-alloc", "gpu-allocator", "gpu-descriptor", + "hashbrown", "js-sys", "khronos-egl", "libc", @@ -8565,7 +8567,7 @@ dependencies = [ [[package]] name = "wgpu-types" version = "24.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=779261e64daa6cf76c826532b7a1561d8ec203fd#779261e64daa6cf76c826532b7a1561d8ec203fd" +source = "git+https://github.com/gfx-rs/wgpu?rev=d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6#d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6" dependencies = [ "bitflags 2.8.0", "js-sys", diff --git a/Cargo.toml b/Cargo.toml index 3c5dfc4adbb..a28f9904e71 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -160,8 +160,8 @@ webrender_api = { git = "https://github.com/servo/webrender", branch = "0.65" } webrender_traits = { path = "components/shared/webrender" } webxr = { git = "https://github.com/servo/webxr" } webxr-api = { git = "https://github.com/servo/webxr" } -wgpu-core = { git = "https://github.com/gfx-rs/wgpu", rev = "779261e64daa6cf76c826532b7a1561d8ec203fd" } -wgpu-types = { git = "https://github.com/gfx-rs/wgpu", rev = "779261e64daa6cf76c826532b7a1561d8ec203fd" } +wgpu-core = { git = "https://github.com/gfx-rs/wgpu", rev = "d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6" } +wgpu-types = { git = "https://github.com/gfx-rs/wgpu", rev = "d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6" } windows-sys = "0.59" wr_malloc_size_of = { git = "https://github.com/servo/webrender", branch = "0.65" } xi-unicode = "0.3.0" diff --git a/tests/wpt/webgpu/meta/webgpu/cts.https.html.ini b/tests/wpt/webgpu/meta/webgpu/cts.https.html.ini index 232d81668e6..bf265f02b54 100644 --- a/tests/wpt/webgpu/meta/webgpu/cts.https.html.ini +++ b/tests/wpt/webgpu/meta/webgpu/cts.https.html.ini @@ -522557,8 +522557,6 @@ [:case="location";placement="ret"] [:case="must_use";placement="func"] - expected: - if os == "linux" and not debug: FAIL [:case="must_use";placement="param"] @@ -522989,8 +522987,6 @@ [:ret=false] [:ret=true] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,validation,functions,restrictions:no_direct_recursion:*] @@ -530835,14 +530831,14 @@ if os == "linux" and not debug: FAIL [:test="function_struct_return"] - expected: - if os == "linux" and not debug: FAIL [:test="function_var"] [:test="parameter"] [:test="var"] + expected: + if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,validation,parse,must_use:ignore_result_of_non_must_use_that_returns_call_of_must_use:*] @@ -544827,20 +544823,32 @@ [:case="contents_lhs_pointer_deref2"] [:case="contents_lhs_pointer_deref2a"] + expected: + if os == "linux" and not debug: FAIL [:case="contents_lhs_pointer_deref3"] [:case="contents_lhs_pointer_deref3a"] + expected: + if os == "linux" and not debug: FAIL [:case="contents_lhs_pointer_deref4"] [:case="contents_lhs_pointer_deref4a"] + expected: + if os == "linux" and not debug: FAIL [:case="contents_lhs_pointer_deref4b"] + expected: + if os == "linux" and not debug: FAIL [:case="contents_lhs_pointer_deref4c"] + expected: + if os == "linux" and not debug: FAIL [:case="contents_lhs_pointer_deref4d"] + expected: + if os == "linux" and not debug: FAIL [:case="contents_lhs_pointer_deref4e"] @@ -544889,12 +544897,20 @@ [:case="contents_rhs_pointer_deref1"] [:case="contents_rhs_pointer_deref1a"] + expected: + if os == "linux" and not debug: FAIL [:case="contents_rhs_pointer_deref2"] + expected: + if os == "linux" and not debug: FAIL [:case="contents_rhs_pointer_swizzle_non_uniform"] + expected: + if os == "linux" and not debug: FAIL [:case="contents_rhs_pointer_swizzle_uniform"] + expected: + if os == "linux" and not debug: FAIL [:case="contents_scalar_alias_nonuniform1"] expected: