diff --git a/Cargo.lock b/Cargo.lock index a65b71e..3135cb5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -974,15 +974,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -1598,11 +1589,10 @@ dependencies = [ "librashader-spirv-cross", "matches", "naga", - "rspirv 0.12.0+sdk-1.3.268.0", + "rspirv", "rustc-hash", "serde", - "spirv 0.3.0+sdk-1.3.268.0", - "spirv-linker", + "spirv", "spirv-to-dxil", "thiserror", ] @@ -1892,7 +1882,7 @@ dependencies = [ "num-traits", "petgraph", "rustc-hash", - "spirv 0.3.0+sdk-1.3.268.0", + "spirv", "termcolor", "thiserror", "unicode-xid", @@ -2569,17 +2559,6 @@ dependencies = [ "serde", ] -[[package]] -name = "rspirv" -version = "0.11.0+1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1503993b59ca9ae4127365c3293517576d7ce56be9f3d8abb1625c85ddc583ba" -dependencies = [ - "fxhash", - "num-traits", - "spirv 0.2.0+1.5.4", -] - [[package]] name = "rspirv" version = "0.12.0+sdk-1.3.268.0" @@ -2587,7 +2566,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cf3a93856b6e5946537278df0d3075596371b1950ccff012f02b0f7eafec8d" dependencies = [ "rustc-hash", - "spirv 0.3.0+sdk-1.3.268.0", + "spirv", ] [[package]] @@ -2780,16 +2759,6 @@ dependencies = [ "lock_api", ] -[[package]] -name = "spirv" -version = "0.2.0+1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" -dependencies = [ - "bitflags 1.3.2", - "num-traits", -] - [[package]] name = "spirv" version = "0.3.0+sdk-1.3.268.0" @@ -2799,17 +2768,6 @@ dependencies = [ "bitflags 2.4.2", ] -[[package]] -name = "spirv-linker" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d236255ec7387809e18d57221d0fa428d6f909abc88524944cdfb7ebab01acb" -dependencies = [ - "rspirv 0.11.0+1.5.4", - "thiserror", - "topological-sort", -] - [[package]] name = "spirv-to-dxil" version = "0.4.7" @@ -3009,12 +2967,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "topological-sort" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa7c7f42dea4b1b99439786f5633aeb9c14c1b53f75e282803c2ec2ad545873c" - [[package]] name = "tracing" version = "0.1.40" diff --git a/librashader-reflect/Cargo.toml b/librashader-reflect/Cargo.toml index b1cf9ad..b645a4a 100644 --- a/librashader-reflect/Cargo.toml +++ b/librashader-reflect/Cargo.toml @@ -23,7 +23,6 @@ librashader-preprocess = { path = "../librashader-preprocess", version = "0.2.2" librashader-presets = { path = "../librashader-presets", version = "0.2.2" } spirv_cross = { package = "librashader-spirv-cross", version = "0.25.1", optional = true } -spirv-linker = "0.1.0" naga = { version = "0.19.0", optional = true } rspirv = { version = "0.12.0", optional = true }