From 291056bf306c0b96be1b5db160bc0499e2bbcb0f Mon Sep 17 00:00:00 2001 From: Firestar99 Date: Wed, 26 Nov 2025 18:33:04 +0100 Subject: [PATCH] difftest: force wgpu to use Vulkan, disable dx12 naga fails to transpile our spirv to hlsl --- Cargo.lock | 18 --- tests/difftests/lib/Cargo.toml | 5 +- tests/difftests/tests/Cargo.lock | 208 ++----------------------------- 3 files changed, 10 insertions(+), 221 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e34454bb23..6057e81629 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -770,7 +770,6 @@ dependencies = [ "ash", "bytemuck", "futures", - "naga", "serde", "serde_json", "spirv-builder", @@ -1794,12 +1793,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3bd0dd2cd90571056fdb71f6275fada10131182f84899f4b2a916e565d81d86" -[[package]] -name = "mach-dxcompiler-rs" -version = "0.1.4+2024.11.22-df583a3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e3cd67e8ea2ba061339150970542cf1c60ba44c6d17e31279cbc133a4b018f8" - [[package]] name = "malloc_buf" version = "0.0.6" @@ -1952,7 +1945,6 @@ dependencies = [ "num-traits", "once_cell", "petgraph", - "pp-rs", "rustc-hash", "spirv", "thiserror 2.0.16", @@ -2531,15 +2523,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" -[[package]] -name = "pp-rs" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee" -dependencies = [ - "unicode-xid", -] - [[package]] name = "presser" version = "0.3.1" @@ -4222,7 +4205,6 @@ dependencies = [ "libc", "libloading", "log", - "mach-dxcompiler-rs", "metal", "naga", "ndk-sys", diff --git a/tests/difftests/lib/Cargo.toml b/tests/difftests/lib/Cargo.toml index 865a329301..b3181f9696 100644 --- a/tests/difftests/lib/Cargo.toml +++ b/tests/difftests/lib/Cargo.toml @@ -19,9 +19,8 @@ use-compiled-tools = [ spirv-builder.workspace = true serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -wgpu = { version = "26.0.1", features = ["spirv", "vulkan-portability", "static-dxc"] } -ash = { version = "0.38", default-features = false } -naga = { version = "26.0.0", features = ["glsl-in", "spv-out"] } +wgpu = { version = "26.0.1", default-features = false, features = ["std", "parking_lot", "spirv", "wgsl", "vulkan", "vulkan-portability", "metal"] } +ash = { version = "0.38" } tempfile = "3.5" futures = "0.3.31" bytemuck = "1.21.0" diff --git a/tests/difftests/tests/Cargo.lock b/tests/difftests/tests/Cargo.lock index 982445e579..a68881d522 100644 --- a/tests/difftests/tests/Cargo.lock +++ b/tests/difftests/tests/Cargo.lock @@ -249,7 +249,7 @@ dependencies = [ "serde", "serde-untagged", "serde-value", - "thiserror 2.0.16", + "thiserror", "toml", "unicode-xid", "url", @@ -267,7 +267,7 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror 2.0.16", + "thiserror", ] [[package]] @@ -421,7 +421,6 @@ dependencies = [ "ash", "bytemuck", "futures", - "naga", "serde", "serde_json", "spirv-builder", @@ -630,17 +629,6 @@ dependencies = [ "wasi", ] -[[package]] -name = "gl_generator" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" -dependencies = [ - "khronos_api", - "log", - "xml-rs", -] - [[package]] name = "glam" version = "0.30.8" @@ -650,27 +638,6 @@ dependencies = [ "libm", ] -[[package]] -name = "glow" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08" -dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "glutin_wgl_sys" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4ee00b289aba7a9e5306d57c2d05499b2e5dc427f84ac708bd2c090212cf3e" -dependencies = [ - "gl_generator", -] - [[package]] name = "gpu-alloc" version = "0.6.0" @@ -690,18 +657,6 @@ dependencies = [ "bitflags 2.9.4", ] -[[package]] -name = "gpu-allocator" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd" -dependencies = [ - "log", - "presser", - "thiserror 1.0.69", - "windows", -] - [[package]] name = "gpu-descriptor" version = "0.3.2" @@ -873,12 +828,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - [[package]] name = "js-sys" version = "0.3.78" @@ -889,23 +838,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "khronos-egl" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" -dependencies = [ - "libc", - "libloading", - "pkg-config", -] - -[[package]] -name = "khronos_api" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" - [[package]] name = "libc" version = "0.2.175" @@ -962,12 +894,6 @@ version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" -[[package]] -name = "mach-dxcompiler-rs" -version = "0.1.4+2024.11.22-df583a3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e3cd67e8ea2ba061339150970542cf1c60ba44c6d17e31279cbc133a4b018f8" - [[package]] name = "malloc_buf" version = "0.0.6" @@ -1068,22 +994,12 @@ dependencies = [ "num-traits", "once_cell", "petgraph", - "pp-rs", "rustc-hash", "spirv", - "thiserror 2.0.16", + "thiserror", "unicode-ident", ] -[[package]] -name = "ndk-sys" -version = "0.6.0+11769913" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" -dependencies = [ - "jni-sys", -] - [[package]] name = "num-traits" version = "0.2.19" @@ -1206,12 +1122,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkg-config" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" - [[package]] name = "portable-atomic" version = "1.11.1" @@ -1236,21 +1146,6 @@ dependencies = [ "zerovec", ] -[[package]] -name = "pp-rs" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "presser" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" - [[package]] name = "proc-macro2" version = "1.0.101" @@ -1298,12 +1193,6 @@ version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" -[[package]] -name = "range-alloc" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d6831663a5098ea164f89cff59c6284e95f4e3c76ce9848d4529f5ccca9bde" - [[package]] name = "raw-string" version = "0.3.5" @@ -1480,15 +1369,6 @@ version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" -[[package]] -name = "slotmap" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" -dependencies = [ - "version_check", -] - [[package]] name = "smallvec" version = "1.15.1" @@ -1517,7 +1397,7 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror 2.0.16", + "thiserror", ] [[package]] @@ -1602,33 +1482,13 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl 1.0.69", -] - [[package]] name = "thiserror" version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0" dependencies = [ - "thiserror-impl 2.0.16", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "thiserror-impl", ] [[package]] @@ -1799,12 +1659,6 @@ dependencies = [ "difftest", ] -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - [[package]] name = "wasi" version = "0.14.4+wasi-0.2.4" @@ -1822,7 +1676,6 @@ checksum = "7e14915cadd45b529bb8d1f343c4ed0ac1de926144b746e2710f9cd05df6603b" dependencies = [ "cfg-if", "once_cell", - "rustversion", "wasm-bindgen-macro", "wasm-bindgen-shared", ] @@ -1841,19 +1694,6 @@ dependencies = [ "wasm-bindgen-shared", ] -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca85039a9b469b38336411d6d6ced91f3fc87109a2a27b0c197663f5144dffe" -dependencies = [ - "cfg-if", - "js-sys", - "once_cell", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "wasm-bindgen-macro" version = "0.2.101" @@ -1908,7 +1748,6 @@ dependencies = [ "cfg_aliases", "document-features", "hashbrown", - "js-sys", "log", "naga", "parking_lot", @@ -1917,9 +1756,6 @@ dependencies = [ "raw-window-handle", "smallvec", "static_assertions", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", "wgpu-core", "wgpu-hal", "wgpu-types", @@ -1949,9 +1785,8 @@ dependencies = [ "raw-window-handle", "rustc-hash", "smallvec", - "thiserror 2.0.16", + "thiserror", "wgpu-core-deps-apple", - "wgpu-core-deps-emscripten", "wgpu-core-deps-windows-linux-android", "wgpu-hal", "wgpu-types", @@ -1966,15 +1801,6 @@ dependencies = [ "wgpu-hal", ] -[[package]] -name = "wgpu-core-deps-emscripten" -version = "26.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7670e390f416006f746b4600fdd9136455e3627f5bd763abf9a65daa216dd2d" -dependencies = [ - "wgpu-hal", -] - [[package]] name = "wgpu-core-deps-windows-linux-android" version = "26.0.0" @@ -1993,44 +1819,32 @@ dependencies = [ "android_system_properties", "arrayvec", "ash", - "bit-set", "bitflags 2.9.4", "block", "bytemuck", "cfg-if", "cfg_aliases", "core-graphics-types", - "glow", - "glutin_wgl_sys", "gpu-alloc", - "gpu-allocator", "gpu-descriptor", "hashbrown", - "js-sys", - "khronos-egl", "libc", "libloading", "log", - "mach-dxcompiler-rs", "metal", "naga", - "ndk-sys", "objc", "ordered-float 5.0.0", "parking_lot", "portable-atomic", "portable-atomic-util", "profiling", - "range-alloc", "raw-window-handle", "renderdoc-sys", "smallvec", - "thiserror 2.0.16", - "wasm-bindgen", - "web-sys", + "thiserror", "wgpu-types", "windows", - "windows-core", ] [[package]] @@ -2043,7 +1857,7 @@ dependencies = [ "bytemuck", "js-sys", "log", - "thiserror 2.0.16", + "thiserror", "web-sys", ] @@ -2326,12 +2140,6 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" -[[package]] -name = "xml-rs" -version = "0.8.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd8403733700263c6eb89f192880191f1b83e332f7a20371ddcf421c4a337c7" - [[package]] name = "yoke" version = "0.8.0"