update deps: rust-gpu: 86d60422 -> d78c3017 and associated rust-toolchain: nightly-2022-12-18 -> nightly-2023-01-21

This commit is contained in:
2025-01-14 02:39:33 +00:00
parent 96932ddb64
commit 518e0821df
5 changed files with 19 additions and 18 deletions

25
Cargo.lock generated
View File

@@ -1727,13 +1727,14 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]] [[package]]
name = "rustc_codegen_spirv" name = "rustc_codegen_spirv"
version = "0.4.0" version = "0.5.0"
source = "git+https://github.com/Rust-GPU/rust-gpu?rev=86d6042204e4c0f9ab04120155636d714037fadc#86d6042204e4c0f9ab04120155636d714037fadc" source = "git+https://github.com/Rust-GPU/rust-gpu?rev=d78c301799e9d254aab3156a230c9a59efd94122#d78c301799e9d254aab3156a230c9a59efd94122"
dependencies = [ dependencies = [
"ar", "ar",
"either", "either",
"hashbrown 0.11.2", "hashbrown 0.11.2",
"indexmap 1.9.1", "indexmap 1.9.1",
"lazy_static",
"libc", "libc",
"num-traits", "num-traits",
"once_cell", "once_cell",
@@ -1752,8 +1753,8 @@ dependencies = [
[[package]] [[package]]
name = "rustc_codegen_spirv-types" name = "rustc_codegen_spirv-types"
version = "0.4.0" version = "0.5.0"
source = "git+https://github.com/Rust-GPU/rust-gpu?rev=86d6042204e4c0f9ab04120155636d714037fadc#86d6042204e4c0f9ab04120155636d714037fadc" source = "git+https://github.com/Rust-GPU/rust-gpu?rev=d78c301799e9d254aab3156a230c9a59efd94122#d78c301799e9d254aab3156a230c9a59efd94122"
dependencies = [ dependencies = [
"rspirv", "rspirv",
"serde", "serde",
@@ -1965,8 +1966,8 @@ dependencies = [
[[package]] [[package]]
name = "spirv-builder" name = "spirv-builder"
version = "0.4.0" version = "0.5.0"
source = "git+https://github.com/Rust-GPU/rust-gpu?rev=86d6042204e4c0f9ab04120155636d714037fadc#86d6042204e4c0f9ab04120155636d714037fadc" source = "git+https://github.com/Rust-GPU/rust-gpu?rev=d78c301799e9d254aab3156a230c9a59efd94122#d78c301799e9d254aab3156a230c9a59efd94122"
dependencies = [ dependencies = [
"memchr", "memchr",
"raw-string", "raw-string",
@@ -1978,8 +1979,8 @@ dependencies = [
[[package]] [[package]]
name = "spirv-std" name = "spirv-std"
version = "0.4.0" version = "0.5.0"
source = "git+https://github.com/Rust-GPU/rust-gpu?rev=86d6042204e4c0f9ab04120155636d714037fadc#86d6042204e4c0f9ab04120155636d714037fadc" source = "git+https://github.com/Rust-GPU/rust-gpu?rev=d78c301799e9d254aab3156a230c9a59efd94122#d78c301799e9d254aab3156a230c9a59efd94122"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"glam", "glam",
@@ -1990,8 +1991,8 @@ dependencies = [
[[package]] [[package]]
name = "spirv-std-macros" name = "spirv-std-macros"
version = "0.4.0" version = "0.5.0"
source = "git+https://github.com/Rust-GPU/rust-gpu?rev=86d6042204e4c0f9ab04120155636d714037fadc#86d6042204e4c0f9ab04120155636d714037fadc" source = "git+https://github.com/Rust-GPU/rust-gpu?rev=d78c301799e9d254aab3156a230c9a59efd94122#d78c301799e9d254aab3156a230c9a59efd94122"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@@ -2001,8 +2002,8 @@ dependencies = [
[[package]] [[package]]
name = "spirv-std-types" name = "spirv-std-types"
version = "0.4.0" version = "0.5.0"
source = "git+https://github.com/Rust-GPU/rust-gpu?rev=86d6042204e4c0f9ab04120155636d714037fadc#86d6042204e4c0f9ab04120155636d714037fadc" source = "git+https://github.com/Rust-GPU/rust-gpu?rev=d78c301799e9d254aab3156a230c9a59efd94122#d78c301799e9d254aab3156a230c9a59efd94122"
[[package]] [[package]]
name = "spirv-tools" name = "spirv-tools"

View File

@@ -37,9 +37,9 @@ wgpu = "0.12"
# TODO: update to 0.13 # TODO: update to 0.13
# wgpu = { version = "0.13", features = ["spirv", "vulkan-portability"] } # MIT or Apache 2.0 # wgpu = { version = "0.13", features = ["spirv", "vulkan-portability"] } # MIT or Apache 2.0
# spirv-* is 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-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 = "86d6042204e4c0f9ab04120155636d714037fadc" } spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "d78c301799e9d254aab3156a230c9a59efd94122" }
spirv-std-macros = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "86d6042204e4c0f9ab04120155636d714037fadc" } spirv-std-macros = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "d78c301799e9d254aab3156a230c9a59efd94122" }
spirv_backend = { path = "../spirv_backend" } spirv_backend = { path = "../spirv_backend" }
spirv_backend_runner = { path = "../spirv_backend_runner" } spirv_backend_runner = { path = "../spirv_backend_runner" }
coremem_cross = { path = "../cross", features = ["iter", "fmt", "serde", "std"] } coremem_cross = { path = "../cross", features = ["iter", "fmt", "serde", "std"] }

View File

@@ -7,5 +7,5 @@ edition = "2021"
crate-type = ["dylib", "lib"] crate-type = ["dylib", "lib"]
[dependencies] [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" } coremem_cross = { path = "../cross" }

View File

@@ -5,7 +5,7 @@ authors = ["Colin <colin@uninsane.org>"]
edition = "2021" edition = "2021"
[dependencies] [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). # 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 # this needs to match the rustc lock file -- not just its Cargo.toml -- so we pin down to the patch level

View File

@@ -1,5 +1,5 @@
[toolchain] [toolchain]
channel = "nightly-2022-12-18" channel = "nightly-2023-01-21"
components = [ "rust-src", "rustc-dev", "llvm-tools-preview" ] components = [ "rust-src", "rustc-dev", "llvm-tools-preview" ]
targets = [ "x86_64-unknown-linux-gnu" ] targets = [ "x86_64-unknown-linux-gnu" ]
profile = "default" profile = "default"