Compare commits

...

1 Commits

Author SHA1 Message Date
galister ab7ced2014 Revert "Deduplicate vulkano dependency (#352)"
This reverts commit 4a853fd79b.
2026-01-10 23:49:53 +09:00
2 changed files with 35 additions and 8 deletions

37
Cargo.lock generated
View File

@ -5837,7 +5837,7 @@ dependencies = [
"log", "log",
"rust-embed", "rust-embed",
"tracing-subscriber", "tracing-subscriber",
"vulkano", "vulkano 0.35.2 (git+https://github.com/galister/vulkano.git?rev=cf7f92867928a56ce16b376037c1120f2b167678)",
"vulkano-shaders", "vulkano-shaders",
"wgui", "wgui",
"winit", "winit",
@ -5995,6 +5995,35 @@ dependencies = [
"xml-rs", "xml-rs",
] ]
[[package]]
name = "vulkano"
version = "0.35.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee487adf7c13e5aa46d4d7fac6ffb8e172eb7e6472aaf815e9ade4992f8f2414"
dependencies = [
"ash",
"bytemuck",
"crossbeam-queue",
"foldhash 0.1.5",
"half",
"heck 0.4.1",
"indexmap 2.12.1",
"libloading 0.8.9",
"nom 7.1.3",
"once_cell",
"parking_lot",
"proc-macro2",
"quote",
"raw-window-handle",
"raw-window-metal",
"serde",
"serde_json",
"slabbin",
"smallvec",
"thread_local",
"vk-parse",
]
[[package]] [[package]]
name = "vulkano" name = "vulkano"
version = "0.35.2" version = "0.35.2"
@ -6047,7 +6076,7 @@ dependencies = [
"quote", "quote",
"shaderc", "shaderc",
"syn 2.0.113", "syn 2.0.113",
"vulkano", "vulkano 0.35.2 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -6345,7 +6374,7 @@ dependencies = [
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
"uuid", "uuid",
"vulkano", "vulkano 0.35.2 (git+https://github.com/galister/vulkano.git?rev=cf7f92867928a56ce16b376037c1120f2b167678)",
"vulkano-shaders", "vulkano-shaders",
"wayland-client", "wayland-client",
"wayvr-ipc", "wayvr-ipc",
@ -6437,7 +6466,7 @@ dependencies = [
"slotmap", "slotmap",
"smallvec", "smallvec",
"taffy", "taffy",
"vulkano", "vulkano 0.35.2 (git+https://github.com/galister/vulkano.git?rev=cf7f92867928a56ce16b376037c1120f2b167678)",
"vulkano-shaders", "vulkano-shaders",
] ]

View File

@ -33,9 +33,6 @@ members = [
] ]
resolver = "3" resolver = "3"
[patch.crates-io]
vulkano = { git = "https://github.com/galister/vulkano.git", rev = "cf7f92867928a56ce16b376037c1120f2b167678" }
[workspace.dependencies] [workspace.dependencies]
anyhow = "1.0.100" anyhow = "1.0.100"
glam = { version = "0.30.9", features = ["mint", "serde"] } glam = { version = "0.30.9", features = ["mint", "serde"] }
@ -50,7 +47,8 @@ serde = { version = "1", features = ["derive"] }
serde_json = "1.0.145" serde_json = "1.0.145"
slotmap = "1.1.1" slotmap = "1.1.1"
strum = { version = "0.27.2", features = ["derive"] } strum = { version = "0.27.2", features = ["derive"] }
vulkano = { version = "0.35.2", default-features = false, features = [ #vulkano = { version = "0.35.2", default-features = false, features = [
vulkano = { git = "https://github.com/galister/vulkano.git", rev = "cf7f92867928a56ce16b376037c1120f2b167678", default-features = false, features = [
"macros", "macros",
] } ] }
vulkano-shaders = "0.35.0" vulkano-shaders = "0.35.0"