diff --git a/Cargo.lock b/Cargo.lock index 737dd49e12..9692ae9540 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2081,7 +2081,7 @@ dependencies = [ "rspirv", "rustc-hash", "serde", - "spirv 0.2.0+1.5.4", + "spirv 0.3.0+sdk-1.3.268.0", "termcolor", "thiserror", "unicode-xid", @@ -3230,21 +3230,20 @@ dependencies = [ [[package]] name = "spirv" -version = "0.2.0+1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +version = "0.2.0+sdk-1.2.198" +source = "git+https://github.com/gfx-rs/rspirv?rev=b969f175d5663258b4891e44b76c1544da9661ab#b969f175d5663258b4891e44b76c1544da9661ab" dependencies = [ "bitflags 1.3.2", - "num-traits", - "serde", ] [[package]] name = "spirv" -version = "0.2.0+sdk-1.2.198" -source = "git+https://github.com/gfx-rs/rspirv?rev=b969f175d5663258b4891e44b76c1544da9661ab#b969f175d5663258b4891e44b76c1544da9661ab" +version = "0.3.0+sdk-1.3.268.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", + "serde", ] [[package]] diff --git a/naga/Cargo.toml b/naga/Cargo.toml index af50e56a37..7147a7cf76 100644 --- a/naga/Cargo.toml +++ b/naga/Cargo.toml @@ -53,7 +53,7 @@ rustc-hash = "1.1.0" indexmap = { version = "2", features = ["std"] } log = "0.4" num-traits = "0.2" -spirv = { version = "0.2", optional = true } +spirv = { version = "0.3", optional = true } thiserror = "1.0.52" serde = { version = "1.0.193", features = ["derive"], optional = true } petgraph = { version = "0.6", optional = true } @@ -75,4 +75,4 @@ hlsl-snapshots = { version = "0.1.0", path = "./hlsl-snapshots" } ron = "0.8.0" rspirv = { version = "0.11", git = "https://github.com/gfx-rs/rspirv", rev = "b969f175d5663258b4891e44b76c1544da9661ab" } serde = { version = "1.0", features = ["derive"] } -spirv = { version = "0.2", features = ["deserialize"] } +spirv = { version = "0.3", features = ["deserialize"] }