diff --git a/Cargo.lock b/Cargo.lock index d8566d6..1ef2cbf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1727,13 +1727,14 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_codegen_spirv" -version = "0.4.0" -source = "git+https://github.com/Rust-GPU/rust-gpu?rev=86d6042204e4c0f9ab04120155636d714037fadc#86d6042204e4c0f9ab04120155636d714037fadc" +version = "0.5.0" +source = "git+https://github.com/Rust-GPU/rust-gpu?rev=d78c301799e9d254aab3156a230c9a59efd94122#d78c301799e9d254aab3156a230c9a59efd94122" dependencies = [ "ar", "either", "hashbrown 0.11.2", "indexmap 1.9.1", + "lazy_static", "libc", "num-traits", "once_cell", @@ -1752,8 +1753,8 @@ dependencies = [ [[package]] name = "rustc_codegen_spirv-types" -version = "0.4.0" -source = "git+https://github.com/Rust-GPU/rust-gpu?rev=86d6042204e4c0f9ab04120155636d714037fadc#86d6042204e4c0f9ab04120155636d714037fadc" +version = "0.5.0" +source = "git+https://github.com/Rust-GPU/rust-gpu?rev=d78c301799e9d254aab3156a230c9a59efd94122#d78c301799e9d254aab3156a230c9a59efd94122" dependencies = [ "rspirv", "serde", @@ -1965,8 +1966,8 @@ dependencies = [ [[package]] name = "spirv-builder" -version = "0.4.0" -source = "git+https://github.com/Rust-GPU/rust-gpu?rev=86d6042204e4c0f9ab04120155636d714037fadc#86d6042204e4c0f9ab04120155636d714037fadc" +version = "0.5.0" +source = "git+https://github.com/Rust-GPU/rust-gpu?rev=d78c301799e9d254aab3156a230c9a59efd94122#d78c301799e9d254aab3156a230c9a59efd94122" dependencies = [ "memchr", "raw-string", @@ -1978,8 +1979,8 @@ dependencies = [ [[package]] name = "spirv-std" -version = "0.4.0" -source = "git+https://github.com/Rust-GPU/rust-gpu?rev=86d6042204e4c0f9ab04120155636d714037fadc#86d6042204e4c0f9ab04120155636d714037fadc" +version = "0.5.0" +source = "git+https://github.com/Rust-GPU/rust-gpu?rev=d78c301799e9d254aab3156a230c9a59efd94122#d78c301799e9d254aab3156a230c9a59efd94122" dependencies = [ "bitflags", "glam", @@ -1990,8 +1991,8 @@ dependencies = [ [[package]] name = "spirv-std-macros" -version = "0.4.0" -source = "git+https://github.com/Rust-GPU/rust-gpu?rev=86d6042204e4c0f9ab04120155636d714037fadc#86d6042204e4c0f9ab04120155636d714037fadc" +version = "0.5.0" +source = "git+https://github.com/Rust-GPU/rust-gpu?rev=d78c301799e9d254aab3156a230c9a59efd94122#d78c301799e9d254aab3156a230c9a59efd94122" dependencies = [ "proc-macro2", "quote", @@ -2001,8 +2002,8 @@ dependencies = [ [[package]] name = "spirv-std-types" -version = "0.4.0" -source = "git+https://github.com/Rust-GPU/rust-gpu?rev=86d6042204e4c0f9ab04120155636d714037fadc#86d6042204e4c0f9ab04120155636d714037fadc" +version = "0.5.0" +source = "git+https://github.com/Rust-GPU/rust-gpu?rev=d78c301799e9d254aab3156a230c9a59efd94122#d78c301799e9d254aab3156a230c9a59efd94122" [[package]] name = "spirv-tools" diff --git a/crates/coremem/Cargo.toml b/crates/coremem/Cargo.toml index 574d95f..16fb87a 100644 --- a/crates/coremem/Cargo.toml +++ b/crates/coremem/Cargo.toml @@ -37,9 +37,9 @@ wgpu = "0.12" # TODO: update to 0.13 # wgpu = { version = "0.13", features = ["spirv", "vulkan-portability"] } # MIT or Apache 2.0 # spirv-* is MIT or Apache 2.0 -spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "86d6042204e4c0f9ab04120155636d714037fadc", features = ["use-compiled-tools"] } -spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "86d6042204e4c0f9ab04120155636d714037fadc" } -spirv-std-macros = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "86d6042204e4c0f9ab04120155636d714037fadc" } +spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "d78c301799e9d254aab3156a230c9a59efd94122", features = ["use-compiled-tools"] } +spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "d78c301799e9d254aab3156a230c9a59efd94122" } +spirv-std-macros = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "d78c301799e9d254aab3156a230c9a59efd94122" } spirv_backend = { path = "../spirv_backend" } spirv_backend_runner = { path = "../spirv_backend_runner" } coremem_cross = { path = "../cross", features = ["iter", "fmt", "serde", "std"] } diff --git a/crates/spirv_backend/Cargo.toml b/crates/spirv_backend/Cargo.toml index eee99fe..14ab8e8 100644 --- a/crates/spirv_backend/Cargo.toml +++ b/crates/spirv_backend/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" crate-type = ["dylib", "lib"] [dependencies] -spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "86d6042204e4c0f9ab04120155636d714037fadc", features = ["glam"] } # MIT or Apache 2.0 +spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "d78c301799e9d254aab3156a230c9a59efd94122", features = ["glam"] } # MIT or Apache 2.0 coremem_cross = { path = "../cross" } diff --git a/crates/spirv_backend_builder/Cargo.toml b/crates/spirv_backend_builder/Cargo.toml index 5d00d9e..073cbee 100644 --- a/crates/spirv_backend_builder/Cargo.toml +++ b/crates/spirv_backend_builder/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Colin "] edition = "2021" [dependencies] -spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "86d6042204e4c0f9ab04120155636d714037fadc", features = ["use-compiled-tools"] } +spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "d78c301799e9d254aab3156a230c9a59efd94122", features = ["use-compiled-tools"] } # these deps are to satisfy internal rustc stuff, since spirv-builder links into rustc internals (HACK). # this needs to match the rustc lock file -- not just its Cargo.toml -- so we pin down to the patch level diff --git a/rust-toolchain.toml b/rust-toolchain.toml index fc8ffba..789d776 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "nightly-2022-12-18" +channel = "nightly-2023-01-21" components = [ "rust-src", "rustc-dev", "llvm-tools-preview" ] targets = [ "x86_64-unknown-linux-gnu" ] profile = "default"