From c5fe64a59454be739f9d09a088f900656965f559 Mon Sep 17 00:00:00 2001 From: Samson <16504129+sagudev@users.noreply.github.com> Date: Mon, 29 Jul 2024 15:55:56 +0200 Subject: [PATCH] webgpu: update wgpu again (#32873) * Update wgpu Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> * expect Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> --------- Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> --- Cargo.lock | 137 +++++++++++++----- Cargo.toml | 4 +- servo-tidy.toml | 2 + .../wpt/webgpu/meta/webgpu/cts.https.html.ini | 132 +---------------- 4 files changed, 111 insertions(+), 164 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b3dfeca9c7e..11a803e562f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -756,7 +756,7 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1209,7 +1209,7 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] name = "d3d12" version = "22.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=65b6e15f0fdf46b109df66ec57b75aa6be9b067d#65b6e15f0fdf46b109df66ec57b75aa6be9b067d" +source = "git+https://github.com/gfx-rs/wgpu?rev=69eea63757f097bc0953e5ed607eefe1977f9efa#69eea63757f097bc0953e5ed607eefe1977f9efa" dependencies = [ "bitflags 2.6.0", "libloading", @@ -2225,7 +2225,7 @@ dependencies = [ "vec_map", "wasm-bindgen", "web-sys", - "windows", + "windows 0.48.0", ] [[package]] @@ -2996,7 +2996,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -3547,7 +3547,7 @@ dependencies = [ "serde", "tempfile", "uuid", - "windows", + "windows 0.48.0", ] [[package]] @@ -3919,7 +3919,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.48.5", ] [[package]] @@ -4374,7 +4374,7 @@ checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" [[package]] name = "naga" version = "22.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=65b6e15f0fdf46b109df66ec57b75aa6be9b067d#65b6e15f0fdf46b109df66ec57b75aa6be9b067d" +source = "git+https://github.com/gfx-rs/wgpu?rev=69eea63757f097bc0953e5ed607eefe1977f9efa#69eea63757f097bc0953e5ed607eefe1977f9efa" dependencies = [ "arrayvec", "bit-set", @@ -4863,7 +4863,7 @@ dependencies = [ "libc", "redox_syscall 0.5.1", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -7787,7 +7787,7 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu-core" version = "22.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=65b6e15f0fdf46b109df66ec57b75aa6be9b067d#65b6e15f0fdf46b109df66ec57b75aa6be9b067d" +source = "git+https://github.com/gfx-rs/wgpu?rev=69eea63757f097bc0953e5ed607eefe1977f9efa#69eea63757f097bc0953e5ed607eefe1977f9efa" dependencies = [ "arrayvec", "bit-vec", @@ -7812,7 +7812,7 @@ dependencies = [ [[package]] name = "wgpu-hal" version = "22.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=65b6e15f0fdf46b109df66ec57b75aa6be9b067d#65b6e15f0fdf46b109df66ec57b75aa6be9b067d" +source = "git+https://github.com/gfx-rs/wgpu?rev=69eea63757f097bc0953e5ed607eefe1977f9efa#69eea63757f097bc0953e5ed607eefe1977f9efa" dependencies = [ "android_system_properties", "arrayvec", @@ -7848,12 +7848,13 @@ dependencies = [ "web-sys", "wgpu-types", "winapi", + "windows 0.58.0", ] [[package]] name = "wgpu-types" version = "22.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=65b6e15f0fdf46b109df66ec57b75aa6be9b067d#65b6e15f0fdf46b109df66ec57b75aa6be9b067d" +source = "git+https://github.com/gfx-rs/wgpu?rev=69eea63757f097bc0953e5ed607eefe1977f9efa#69eea63757f097bc0953e5ed607eefe1977f9efa" dependencies = [ "bitflags 2.6.0", "js-sys", @@ -7913,13 +7914,77 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +dependencies = [ + "windows-core 0.58.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows-core" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -7961,7 +8026,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -7996,18 +8061,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -8024,9 +8089,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -8042,9 +8107,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -8060,9 +8125,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" @@ -8084,9 +8149,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -8102,9 +8167,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -8120,9 +8185,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -8138,9 +8203,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" diff --git a/Cargo.toml b/Cargo.toml index a60aa568330..466f7a976b6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -138,8 +138,8 @@ webpki-roots = "0.25" webrender = { git = "https://github.com/servo/webrender", branch = "0.64", features = ["capture"] } webrender_api = { git = "https://github.com/servo/webrender", branch = "0.64" } webrender_traits = { path = "components/shared/webrender" } -wgpu-core = { git = "https://github.com/gfx-rs/wgpu", rev = "65b6e15f0fdf46b109df66ec57b75aa6be9b067d" } -wgpu-types = { git = "https://github.com/gfx-rs/wgpu", rev = "65b6e15f0fdf46b109df66ec57b75aa6be9b067d" } +wgpu-core = { git = "https://github.com/gfx-rs/wgpu", rev = "69eea63757f097bc0953e5ed607eefe1977f9efa" } +wgpu-types = { git = "https://github.com/gfx-rs/wgpu", rev = "69eea63757f097bc0953e5ed607eefe1977f9efa" } windows-sys = "0.52" xi-unicode = "0.1.0" xml5ever = "0.18" diff --git a/servo-tidy.toml b/servo-tidy.toml index 21e8ce52fc3..edfc226b44f 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -52,6 +52,8 @@ packages = [ "foreign-types-shared", "metal", "glow", + "windows", + "windows-core", # quickcheck (required by layout_2020 for tests) is # stuck on 0.8.4 with no new releases. diff --git a/tests/wpt/webgpu/meta/webgpu/cts.https.html.ini b/tests/wpt/webgpu/meta/webgpu/cts.https.html.ini index 4e3be39f2e6..40b77f56387 100644 --- a/tests/wpt/webgpu/meta/webgpu/cts.https.html.ini +++ b/tests/wpt/webgpu/meta/webgpu/cts.https.html.ini @@ -33562,36 +33562,20 @@ [:pipelineType="auto0";bindingType="auto0";swap=false;empty=true;renderCommand="drawIndirect"] [:pipelineType="auto0";bindingType="auto0";swap=true;empty=false;renderCommand="draw"] - expected: - if os == "linux" and not debug: FAIL [:pipelineType="auto0";bindingType="auto0";swap=true;empty=false;renderCommand="drawIndexed"] - expected: - if os == "linux" and not debug: FAIL [:pipelineType="auto0";bindingType="auto0";swap=true;empty=false;renderCommand="drawIndexedIndirect"] - expected: - if os == "linux" and not debug: FAIL [:pipelineType="auto0";bindingType="auto0";swap=true;empty=false;renderCommand="drawIndirect"] - expected: - if os == "linux" and not debug: FAIL [:pipelineType="auto0";bindingType="auto0";swap=true;empty=true;renderCommand="draw"] - expected: - if os == "linux" and not debug: FAIL [:pipelineType="auto0";bindingType="auto0";swap=true;empty=true;renderCommand="drawIndexed"] - expected: - if os == "linux" and not debug: FAIL [:pipelineType="auto0";bindingType="auto0";swap=true;empty=true;renderCommand="drawIndexedIndirect"] - expected: - if os == "linux" and not debug: FAIL [:pipelineType="auto0";bindingType="auto0";swap=true;empty=true;renderCommand="drawIndirect"] - expected: - if os == "linux" and not debug: FAIL [:pipelineType="auto0";bindingType="auto1";swap=false;empty=false;renderCommand="draw"] @@ -69455,71 +69439,37 @@ [cts.https.html?q=webgpu:api,validation,state,device_lost,destroy:queue,writeTexture,2d,uncompressed_format:*] - expected: - if os == "linux" and not debug: TIMEOUT [:format="bgra8unorm";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="bgra8unorm";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="bgra8unorm-srgb";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="bgra8unorm-srgb";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="r16float";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="r16float";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="r16sint";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="r16sint";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="r16uint";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="r16uint";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="r32float";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="r32float";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="r32sint";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="r32sint";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="r32uint";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="r32uint";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="r8sint";awaitLost=false] @@ -69539,59 +69489,35 @@ [:format="rg11b10ufloat";awaitLost=false] expected: - if os == "linux" and not debug: [TIMEOUT, NOTRUN] + if os == "linux" and not debug: FAIL [:format="rg11b10ufloat";awaitLost=true] expected: - if os == "linux" and not debug: [FAIL, NOTRUN] + if os == "linux" and not debug: FAIL [:format="rg16float";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rg16float";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rg16sint";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rg16sint";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rg16uint";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rg16uint";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rg32float";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rg32float";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rg32sint";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rg32sint";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rg32uint";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rg32uint";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rg8sint";awaitLost=false] @@ -69611,113 +69537,67 @@ [:format="rgb10a2uint";awaitLost=false] expected: - if os == "linux" and not debug: [FAIL, TIMEOUT, NOTRUN] + if os == "linux" and not debug: FAIL [:format="rgb10a2uint";awaitLost=true] expected: - if os == "linux" and not debug: TIMEOUT + if os == "linux" and not debug: FAIL [:format="rgb10a2unorm";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rgb10a2unorm";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rgb9e5ufloat";awaitLost=false] expected: - if os == "linux" and not debug: NOTRUN + if os == "linux" and not debug: FAIL [:format="rgb9e5ufloat";awaitLost=true] expected: - if os == "linux" and not debug: NOTRUN + if os == "linux" and not debug: FAIL [:format="rgba16float";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rgba16float";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rgba16sint";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rgba16sint";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rgba16uint";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rgba16uint";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rgba32float";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rgba32float";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rgba32sint";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rgba32sint";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rgba32uint";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rgba32uint";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rgba8sint";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rgba8sint";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rgba8snorm";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rgba8snorm";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rgba8uint";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rgba8uint";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rgba8unorm";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, FAIL] [:format="rgba8unorm";awaitLost=true] [:format="rgba8unorm-srgb";awaitLost=false] - expected: - if os == "linux" and not debug: [PASS, NOTRUN] [:format="rgba8unorm-srgb";awaitLost=true] - expected: - if os == "linux" and not debug: [PASS, TIMEOUT] [cts.https.html?q=webgpu:api,validation,texture,bgra8unorm_storage:configure_storage_usage_on_canvas_context_with_bgra8unorm_storage:*]