diff --git a/Cargo.lock b/Cargo.lock index fd50a75f9e1..8ab82b9f3dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2657,7 +2657,7 @@ checksum = "dcf29e94d6d243368b7a56caa16bc213e4f9f8ed38c4d9557069527b5d5281ca" dependencies = [ "bitflags 2.8.0", "gpu-descriptor-types", - "hashbrown", + "hashbrown 0.15.2", ] [[package]] @@ -3047,6 +3047,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "serde", +] + [[package]] name = "hashbrown" version = "0.15.2" @@ -3861,7 +3871,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.2", ] [[package]] @@ -4726,13 +4736,14 @@ checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" [[package]] name = "naga" version = "24.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6#d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6" +source = "git+https://github.com/gfx-rs/wgpu?rev=d8833d079833c62b4fd00325d0ba08ec0c8bc309#d8833d079833c62b4fd00325d0ba08ec0c8bc309" dependencies = [ "arrayvec", "bit-set", "bitflags 2.8.0", "cfg_aliases", "codespan-reporting", + "hashbrown 0.14.5", "hexf-parse", "indexmap", "log", @@ -4741,7 +4752,7 @@ dependencies = [ "strum", "termcolor", "thiserror 2.0.9", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -8630,14 +8641,14 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu-core" version = "24.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6#d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6" +source = "git+https://github.com/gfx-rs/wgpu?rev=d8833d079833c62b4fd00325d0ba08ec0c8bc309#d8833d079833c62b4fd00325d0ba08ec0c8bc309" dependencies = [ "arrayvec", "bit-vec", "bitflags 2.8.0", "cfg_aliases", "document-features", - "hashbrown", + "hashbrown 0.14.5", "indexmap", "log", "naga", @@ -8655,7 +8666,7 @@ dependencies = [ [[package]] name = "wgpu-hal" version = "24.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6#d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6" +source = "git+https://github.com/gfx-rs/wgpu?rev=d8833d079833c62b4fd00325d0ba08ec0c8bc309#d8833d079833c62b4fd00325d0ba08ec0c8bc309" dependencies = [ "android_system_properties", "arrayvec", @@ -8671,7 +8682,7 @@ dependencies = [ "gpu-alloc", "gpu-allocator", "gpu-descriptor", - "hashbrown", + "hashbrown 0.14.5", "js-sys", "khronos-egl", "libc", @@ -8700,12 +8711,13 @@ dependencies = [ [[package]] name = "wgpu-types" version = "24.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6#d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6" +source = "git+https://github.com/gfx-rs/wgpu?rev=d8833d079833c62b4fd00325d0ba08ec0c8bc309#d8833d079833c62b4fd00325d0ba08ec0c8bc309" dependencies = [ "bitflags 2.8.0", "js-sys", "log", "serde", + "thiserror 2.0.9", "web-sys", ] diff --git a/Cargo.toml b/Cargo.toml index 27ada57bbeb..8548d4b83f7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -163,8 +163,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 = "d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6" } -wgpu-types = { git = "https://github.com/gfx-rs/wgpu", rev = "d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6" } +wgpu-core = { git = "https://github.com/gfx-rs/wgpu", rev = "d8833d079833c62b4fd00325d0ba08ec0c8bc309" } +wgpu-types = { git = "https://github.com/gfx-rs/wgpu", rev = "d8833d079833c62b4fd00325d0ba08ec0c8bc309" } winapi = "0.3" windows-sys = "0.59" wio = "0.2" diff --git a/components/script/dom/webgpu/gpuconvert.rs b/components/script/dom/webgpu/gpuconvert.rs index d83d1e86dfa..fbc507a45ee 100644 --- a/components/script/dom/webgpu/gpuconvert.rs +++ b/components/script/dom/webgpu/gpuconvert.rs @@ -639,12 +639,11 @@ impl<'a> Convert> for &GPUProgrammableStage { .entryPoint .as_ref() .map(|ep| Cow::Owned(ep.to_string())), - constants: Cow::Owned( - self.constants - .as_ref() - .map(|records| records.iter().map(|(k, v)| (k.0.clone(), **v)).collect()) - .unwrap_or_default(), - ), + constants: self + .constants + .as_ref() + .map(|records| records.iter().map(|(k, v)| (k.0.clone(), **v)).collect()) + .unwrap_or_default(), zero_initialize_workgroup_memory: true, } } @@ -659,7 +658,7 @@ impl<'a> Convert> for &GPUBindGroupEntry { GPUBindingResource::GPUTextureView(ref t) => BindingResource::TextureView(t.id().0), GPUBindingResource::GPUBufferBinding(ref b) => { BindingResource::Buffer(BufferBinding { - buffer_id: b.buffer.id().0, + buffer: b.buffer.id().0, offset: b.offset, size: b.size.and_then(wgt::BufferSize::new), }) diff --git a/deny.toml b/deny.toml index 0cbba6bd26f..8f2deab1e94 100644 --- a/deny.toml +++ b/deny.toml @@ -116,6 +116,7 @@ skip = [ "foreign-types-shared", "metal", "windows-core", + "hashbrown", # wgpu-hal depends on 0.5.0. "ndk-sys", diff --git a/tests/wpt/webgpu/meta/webgpu/cts.https.html.ini b/tests/wpt/webgpu/meta/webgpu/cts.https.html.ini index d92953110f2..592ac751cc7 100644 --- a/tests/wpt/webgpu/meta/webgpu/cts.https.html.ini +++ b/tests/wpt/webgpu/meta/webgpu/cts.https.html.ini @@ -3572,24 +3572,14 @@ [cts.https.html?q=webgpu:api,operation,memory_sync,texture,readonly_depth_stencil:sampling_while_testing:*] [:format="depth16unorm";depthReadOnly=false;stencilReadOnly="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:format="depth16unorm";depthReadOnly=true;stencilReadOnly="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:format="depth24plus";depthReadOnly=false;stencilReadOnly="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:format="depth24plus";depthReadOnly=true;stencilReadOnly="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:format="depth24plus-stencil8";depthReadOnly=false;stencilReadOnly=false] - expected: - if os == "linux" and not debug: FAIL [:format="depth24plus-stencil8";depthReadOnly=false;stencilReadOnly=true] expected: @@ -3600,20 +3590,12 @@ if os == "linux" and not debug: FAIL [:format="depth24plus-stencil8";depthReadOnly=true;stencilReadOnly=true] - expected: - if os == "linux" and not debug: FAIL [:format="depth32float";depthReadOnly=false;stencilReadOnly="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:format="depth32float";depthReadOnly=true;stencilReadOnly="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:format="depth32float-stencil8";depthReadOnly=false;stencilReadOnly=false] - expected: - if os == "linux" and not debug: FAIL [:format="depth32float-stencil8";depthReadOnly=false;stencilReadOnly=true] expected: @@ -3624,16 +3606,10 @@ if os == "linux" and not debug: FAIL [:format="depth32float-stencil8";depthReadOnly=true;stencilReadOnly=true] - expected: - if os == "linux" and not debug: FAIL [:format="stencil8";depthReadOnly="_undef_";stencilReadOnly=false] - expected: - if os == "linux" and not debug: FAIL [:format="stencil8";depthReadOnly="_undef_";stencilReadOnly=true] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:api,operation,memory_sync,texture,same_subresource:rw,single_pass,load_resolve:*] @@ -87485,68 +87461,36 @@ [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:division:*] [:inputSource="const";vectorize="_undef_"] - expected: - if os == "linux" and not debug: [PASS, FAIL] [:inputSource="const";vectorize=2] - expected: - if os == "linux" and not debug: [PASS, FAIL] [:inputSource="const";vectorize=3] - expected: - if os == "linux" and not debug: [PASS, FAIL] [:inputSource="const";vectorize=4] - expected: - if os == "linux" and not debug: [PASS, FAIL] [:inputSource="storage_r";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:division_compound:*] @@ -87559,52 +87503,28 @@ [:inputSource="const";vectorize=4] [:inputSource="storage_r";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:division_scalar_vector:*] @@ -87615,45 +87535,25 @@ [:inputSource="const";vectorize_rhs=4] [:inputSource="storage_r";vectorize_rhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize_rhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize_rhs=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_rhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_rhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_rhs=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_rhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_rhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_rhs=4] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:division_vector_scalar:*] - expected: - if os == "linux" and not debug: [OK, CRASH] [:inputSource="const";vectorize_lhs=2] [:inputSource="const";vectorize_lhs=3] @@ -87661,90 +87561,48 @@ [:inputSource="const";vectorize_lhs=4] [:inputSource="storage_r";vectorize_lhs=2] - expected: - if os == "linux" and not debug: [FAIL, NOTRUN] [:inputSource="storage_r";vectorize_lhs=3] - expected: - if os == "linux" and not debug: [FAIL, NOTRUN] [:inputSource="storage_r";vectorize_lhs=4] - expected: - if os == "linux" and not debug: [FAIL, NOTRUN] [:inputSource="storage_rw";vectorize_lhs=2] - expected: - if os == "linux" and not debug: [FAIL, NOTRUN] [:inputSource="storage_rw";vectorize_lhs=3] - expected: - if os == "linux" and not debug: [FAIL, NOTRUN] [:inputSource="storage_rw";vectorize_lhs=4] - expected: - if os == "linux" and not debug: [FAIL, NOTRUN] [:inputSource="uniform";vectorize_lhs=2] - expected: - if os == "linux" and not debug: [FAIL, NOTRUN] [:inputSource="uniform";vectorize_lhs=3] - expected: - if os == "linux" and not debug: [FAIL, NOTRUN] [:inputSource="uniform";vectorize_lhs=4] - expected: - if os == "linux" and not debug: [FAIL, NOTRUN] [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:division_vector_scalar_compound:*] [:inputSource="const";vectorize_lhs=2] - expected: - if os == "linux" and not debug: [PASS, FAIL] [:inputSource="const";vectorize_lhs=3] - expected: - if os == "linux" and not debug: [PASS, FAIL] [:inputSource="const";vectorize_lhs=4] - expected: - if os == "linux" and not debug: [PASS, FAIL] [:inputSource="storage_r";vectorize_lhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize_lhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize_lhs=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_lhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_lhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_lhs=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_lhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_lhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_lhs=4] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:multiplication:*] @@ -87907,118 +87765,62 @@ [:inputSource="const";vectorize=4] [:inputSource="storage_r";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:remainder_compound:*] [:inputSource="const";vectorize="_undef_"] - expected: - if os == "linux" and not debug: [PASS, FAIL] [:inputSource="const";vectorize=2] - expected: - if os == "linux" and not debug: [PASS, FAIL] [:inputSource="const";vectorize=3] - expected: - if os == "linux" and not debug: [PASS, FAIL] [:inputSource="const";vectorize=4] - expected: - if os == "linux" and not debug: [PASS, FAIL] [:inputSource="storage_r";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:remainder_scalar_vector:*] @@ -88029,40 +87831,22 @@ [:inputSource="const";vectorize_rhs=4] [:inputSource="storage_r";vectorize_rhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize_rhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize_rhs=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_rhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_rhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_rhs=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_rhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_rhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_rhs=4] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:remainder_vector_scalar:*] @@ -88073,45 +87857,25 @@ [:inputSource="const";vectorize_lhs=4] [:inputSource="storage_r";vectorize_lhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize_lhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize_lhs=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_lhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_lhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_lhs=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_lhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_lhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_lhs=4] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:remainder_vector_scalar_compound:*] - expected: - if os == "linux" and not debug: [OK, CRASH] [:inputSource="const";vectorize_lhs=2] [:inputSource="const";vectorize_lhs=3] @@ -88119,40 +87883,22 @@ [:inputSource="const";vectorize_lhs=4] [:inputSource="storage_r";vectorize_lhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize_lhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize_lhs=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_lhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_lhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_lhs=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_lhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_lhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_lhs=4] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,execution,expression,binary,i32_arithmetic:subtraction:*] @@ -88686,8 +88432,6 @@ [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:division:*] - expected: - if os == "linux" and not debug: [OK, CRASH] [:inputSource="const";vectorize="_undef_"] [:inputSource="const";vectorize=2] @@ -88697,52 +88441,28 @@ [:inputSource="const";vectorize=4] [:inputSource="storage_r";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:division_compound:*] @@ -88755,52 +88475,28 @@ [:inputSource="const";vectorize=4] [:inputSource="storage_r";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:division_scalar_vector:*] @@ -88811,45 +88507,25 @@ [:inputSource="const";vectorize_rhs=4] [:inputSource="storage_r";vectorize_rhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize_rhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize_rhs=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_rhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_rhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_rhs=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_rhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_rhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_rhs=4] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:division_vector_scalar:*] - expected: - if os == "linux" and not debug: [OK, CRASH] [:inputSource="const";vectorize_lhs=2] [:inputSource="const";vectorize_lhs=3] @@ -88857,45 +88533,25 @@ [:inputSource="const";vectorize_lhs=4] [:inputSource="storage_r";vectorize_lhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize_lhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize_lhs=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_lhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_lhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_lhs=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_lhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_lhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_lhs=4] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:division_vector_scalar_compound:*] - expected: - if os == "linux" and not debug: [OK, CRASH] [:inputSource="const";vectorize_lhs=2] [:inputSource="const";vectorize_lhs=3] @@ -88903,40 +88559,22 @@ [:inputSource="const";vectorize_lhs=4] [:inputSource="storage_r";vectorize_lhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize_lhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize_lhs=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_lhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_lhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_lhs=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_lhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_lhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_lhs=4] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:multiplication:*] @@ -89119,57 +88757,31 @@ [:inputSource="const";vectorize=4] [:inputSource="storage_r";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:remainder_compound:*] - expected: - if os == "linux" and not debug: [OK, CRASH] [:inputSource="const";vectorize="_undef_"] [:inputSource="const";vectorize=2] @@ -89179,52 +88791,28 @@ [:inputSource="const";vectorize=4] [:inputSource="storage_r";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize="_undef_"] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize=4] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:remainder_scalar_vector:*] @@ -89235,40 +88823,22 @@ [:inputSource="const";vectorize_rhs=4] [:inputSource="storage_r";vectorize_rhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize_rhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize_rhs=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_rhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_rhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_rhs=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_rhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_rhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_rhs=4] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:remainder_vector_scalar:*] @@ -89279,45 +88849,25 @@ [:inputSource="const";vectorize_lhs=4] [:inputSource="storage_r";vectorize_lhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize_lhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize_lhs=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_lhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_lhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_lhs=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_lhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_lhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_lhs=4] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:remainder_vector_scalar_compound:*] - expected: - if os == "linux" and not debug: [OK, CRASH] [:inputSource="const";vectorize_lhs=2] [:inputSource="const";vectorize_lhs=3] @@ -89325,40 +88875,22 @@ [:inputSource="const";vectorize_lhs=4] [:inputSource="storage_r";vectorize_lhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize_lhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_r";vectorize_lhs=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_lhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_lhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="storage_rw";vectorize_lhs=4] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_lhs=2] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_lhs=3] - expected: - if os == "linux" and not debug: FAIL [:inputSource="uniform";vectorize_lhs=4] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,execution,expression,binary,u32_arithmetic:subtraction:*] @@ -91935,56 +91467,38 @@ [:workgroupSize=128;scalarType="i32"] [:workgroupSize=128;scalarType="u32"] - expected: - if os == "linux" and not debug: FAIL [:workgroupSize=16;scalarType="i32"] [:workgroupSize=16;scalarType="u32"] - expected: - if os == "linux" and not debug: FAIL [:workgroupSize=1;scalarType="i32"] [:workgroupSize=1;scalarType="u32"] - expected: - if os == "linux" and not debug: FAIL [:workgroupSize=256;scalarType="i32"] [:workgroupSize=256;scalarType="u32"] - expected: - if os == "linux" and not debug: FAIL [:workgroupSize=2;scalarType="i32"] [:workgroupSize=2;scalarType="u32"] - expected: - if os == "linux" and not debug: FAIL [:workgroupSize=32;scalarType="i32"] [:workgroupSize=32;scalarType="u32"] - expected: - if os == "linux" and not debug: FAIL [:workgroupSize=4;scalarType="i32"] [:workgroupSize=4;scalarType="u32"] - expected: - if os == "linux" and not debug: FAIL [:workgroupSize=64;scalarType="i32"] [:workgroupSize=64;scalarType="u32"] - expected: - if os == "linux" and not debug: FAIL [:workgroupSize=8;scalarType="i32"] [:workgroupSize=8;scalarType="u32"] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,atomics,atomicCompareExchangeWeak:compare_exchange_weak_storage_basic:*] @@ -432415,16 +431929,10 @@ [:abstract_type="mat2x3%3Cabstract-float%3E";concrete_type="mat2x3h";length=5] [:abstract_type="vec3%3Cabstract-int%3E";concrete_type="vec3f";length=1] - expected: - if os == "linux" and not debug: FAIL [:abstract_type="vec3%3Cabstract-int%3E";concrete_type="vec3f";length=10] - expected: - if os == "linux" and not debug: FAIL [:abstract_type="vec3%3Cabstract-int%3E";concrete_type="vec3f";length=5] - expected: - if os == "linux" and not debug: FAIL [:abstract_type="vec3%3Cabstract-int%3E";concrete_type="vec3h";length=1] @@ -432433,28 +431941,16 @@ [:abstract_type="vec3%3Cabstract-int%3E";concrete_type="vec3h";length=5] [:abstract_type="vec3%3Cabstract-int%3E";concrete_type="vec3i";length=1] - expected: - if os == "linux" and not debug: FAIL [:abstract_type="vec3%3Cabstract-int%3E";concrete_type="vec3i";length=10] - expected: - if os == "linux" and not debug: FAIL [:abstract_type="vec3%3Cabstract-int%3E";concrete_type="vec3i";length=5] - expected: - if os == "linux" and not debug: FAIL [:abstract_type="vec3%3Cabstract-int%3E";concrete_type="vec3u";length=1] - expected: - if os == "linux" and not debug: FAIL [:abstract_type="vec3%3Cabstract-int%3E";concrete_type="vec3u";length=10] - expected: - if os == "linux" and not debug: FAIL [:abstract_type="vec3%3Cabstract-int%3E";concrete_type="vec3u";length=5] - expected: - if os == "linux" and not debug: FAIL [:abstract_type="vec4%3Cabstract-float%3E";concrete_type="vec4f";length=1] @@ -442827,8 +442323,6 @@ [cts.https.html?q=webgpu:shader,execution,stage:basic_render:*] [:] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,execution,statement,compound:decl:*] @@ -443375,8 +442869,6 @@ [:case="location"] [:case="must_use"] - expected: - if os == "linux" and not debug: FAIL [:case="size"] @@ -443387,8 +442879,6 @@ [cts.https.html?q=webgpu:shader,validation,decl,context_dependent_resolution:builtin_value_names:*] [:case="frag_depth"] - expected: - if os == "linux" and not debug: FAIL [:case="front_facing"] @@ -443411,8 +442901,6 @@ [:case="sample_mask_input"] [:case="sample_mask_output"] - expected: - if os == "linux" and not debug: FAIL [:case="vertex_index"] @@ -445373,6 +444861,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: @@ -445515,8 +445005,6 @@ [:case="runtime_array_const_oob_neg"] [:case="runtime_array_override_oob_neg"] - expected: - if os == "linux" and not debug: FAIL [:case="runtime_in_bounds"] expected: @@ -514141,76 +513629,44 @@ [cts.https.html?q=webgpu:shader,validation,expression,call,builtin,workgroupUniformLoad:only_in_compute:*] [:entry_point="compute";call="bar()"] - expected: - if os == "linux" and not debug: FAIL [:entry_point="compute";call="workgroupUniformLoad(%26wgvar)"] - expected: - if os == "linux" and not debug: FAIL [:entry_point="compute_and_fragment";call="bar()"] - expected: - if os == "linux" and not debug: FAIL [:entry_point="compute_and_fragment";call="workgroupUniformLoad(%26wgvar)"] [:entry_point="fragment";call="bar()"] - expected: - if os == "linux" and not debug: FAIL [:entry_point="fragment";call="workgroupUniformLoad(%26wgvar)"] [:entry_point="fragment_without_call";call="bar()"] - expected: - if os == "linux" and not debug: FAIL [:entry_point="fragment_without_call";call="workgroupUniformLoad(%26wgvar)"] - expected: - if os == "linux" and not debug: FAIL [:entry_point="none";call="bar()"] - expected: - if os == "linux" and not debug: FAIL [:entry_point="none";call="workgroupUniformLoad(%26wgvar)"] - expected: - if os == "linux" and not debug: FAIL [:entry_point="vertex";call="bar()"] - expected: - if os == "linux" and not debug: FAIL [:entry_point="vertex";call="workgroupUniformLoad(%26wgvar)"] [cts.https.html?q=webgpu:shader,validation,expression,early_evaluation:composites:*] [:case="const_let_array_comp"] - expected: - if os == "linux" and not debug: FAIL [:case="const_let_matrix"] - expected: - if os == "linux" and not debug: FAIL [:case="const_let_matrix_comp"] - expected: - if os == "linux" and not debug: FAIL [:case="const_let_matrix_vec"] - expected: - if os == "linux" and not debug: FAIL [:case="const_let_struct_comp"] - expected: - if os == "linux" and not debug: FAIL [:case="const_let_vector"] - expected: - if os == "linux" and not debug: FAIL [:case="const_let_vector_comp"] - expected: - if os == "linux" and not debug: FAIL [:case="const_scalar"] @@ -514221,8 +513677,6 @@ if os == "linux" and not debug: FAIL [:case="override_let_matrix"] - expected: - if os == "linux" and not debug: FAIL [:case="override_let_matrix_comp"] expected: @@ -514245,12 +513699,8 @@ if os == "linux" and not debug: FAIL [:case="override_scalar"] - expected: - if os == "linux" and not debug: FAIL [:case="override_vector"] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,validation,expression,matrix,add_sub:invalid:*] @@ -530713,106 +530163,56 @@ [cts.https.html?q=webgpu:shader,validation,parse,must_use:call:*] [:use="";call="condition"] - expected: - if os == "linux" and not debug: FAIL [:use="";call="let"] - expected: - if os == "linux" and not debug: FAIL [:use="";call="local_var"] - expected: - if os == "linux" and not debug: FAIL [:use="";call="matrix_elem"] - expected: - if os == "linux" and not debug: FAIL [:use="";call="no_call"] - expected: - if os == "linux" and not debug: FAIL [:use="";call="param"] - expected: - if os == "linux" and not debug: FAIL [:use="";call="phony"] - expected: - if os == "linux" and not debug: FAIL [:use="";call="pointer"] - expected: - if os == "linux" and not debug: FAIL [:use="";call="private_var"] - expected: - if os == "linux" and not debug: FAIL [:use="";call="return"] - expected: - if os == "linux" and not debug: FAIL [:use="";call="statement"] - expected: - if os == "linux" and not debug: FAIL [:use="";call="storage_var"] - expected: - if os == "linux" and not debug: FAIL [:use="";call="vector_elem"] - expected: - if os == "linux" and not debug: FAIL [:use="%40must_use";call="condition"] - expected: - if os == "linux" and not debug: FAIL [:use="%40must_use";call="let"] - expected: - if os == "linux" and not debug: FAIL [:use="%40must_use";call="local_var"] - expected: - if os == "linux" and not debug: FAIL [:use="%40must_use";call="matrix_elem"] - expected: - if os == "linux" and not debug: FAIL [:use="%40must_use";call="no_call"] - expected: - if os == "linux" and not debug: FAIL [:use="%40must_use";call="param"] - expected: - if os == "linux" and not debug: FAIL [:use="%40must_use";call="phony"] - expected: - if os == "linux" and not debug: FAIL [:use="%40must_use";call="pointer"] - expected: - if os == "linux" and not debug: FAIL [:use="%40must_use";call="private_var"] - expected: - if os == "linux" and not debug: FAIL [:use="%40must_use";call="return"] - expected: - if os == "linux" and not debug: FAIL [:use="%40must_use";call="statement"] [:use="%40must_use";call="storage_var"] - expected: - if os == "linux" and not debug: FAIL [:use="%40must_use";call="vector_elem"] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,validation,parse,must_use:declaration:*] @@ -530827,8 +530227,6 @@ [:test="function_parameter"] [:test="function_scalar_return"] - expected: - if os == "linux" and not debug: FAIL [:test="function_struct_return"] @@ -530843,8 +530241,6 @@ [cts.https.html?q=webgpu:shader,validation,parse,must_use:ignore_result_of_non_must_use_that_returns_call_of_must_use:*] [:] - expected: - if os == "linux" and not debug: FAIL [cts.https.html?q=webgpu:shader,validation,parse,requires:requires:*] @@ -539423,8 +538819,6 @@ [:return_value_type="abstract-int";fn_return_type="f16"] [:return_value_type="abstract-int";fn_return_type="f32"] - expected: - if os == "linux" and not debug: FAIL [:return_value_type="abstract-int";fn_return_type="i32"] @@ -539433,8 +538827,6 @@ [:return_value_type="abstract-int";fn_return_type="mat4x2h"] [:return_value_type="abstract-int";fn_return_type="u32"] - expected: - if os == "linux" and not debug: FAIL [:return_value_type="abstract-int";fn_return_type="vec2f"] @@ -539635,8 +539027,6 @@ [:return_value_type="vec2ai";fn_return_type="u32"] [:return_value_type="vec2ai";fn_return_type="vec2f"] - expected: - if os == "linux" and not debug: FAIL [:return_value_type="vec2ai";fn_return_type="vec3b"] @@ -539797,8 +539187,6 @@ [:return_value_type="vec4ai";fn_return_type="vec3h"] [:return_value_type="vec4ai";fn_return_type="vec4u"] - expected: - if os == "linux" and not debug: FAIL [:return_value_type="vec4u";fn_return_type="bool"] @@ -541699,8 +541087,6 @@ [:case="mat3x4h"] [:case="member_collision"] - expected: - if os == "linux" and not debug: FAIL [:case="missing_delimiter"]