diff --git a/Cargo.lock b/Cargo.lock index 74c6d115..3d9c2c9f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5837,7 +5837,7 @@ dependencies = [ "log", "rust-embed", "tracing-subscriber", - "vulkano 0.35.0", + "vulkano 0.35.2 (git+https://github.com/galister/vulkano.git?rev=cf7f92867928a56ce16b376037c1120f2b167678)", "vulkano-shaders", "wgui", "winit", @@ -5995,35 +5995,6 @@ dependencies = [ "xml-rs", ] -[[package]] -name = "vulkano" -version = "0.35.0" -source = "git+https://github.com/galister/vulkano.git?rev=ee170056e0402e18eb352df36894aa1f1d35aaad#ee170056e0402e18eb352df36894aa1f1d35aaad" -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", - "vulkano-macros", -] - [[package]] name = "vulkano" version = "0.35.2" @@ -6053,10 +6024,39 @@ dependencies = [ "vk-parse", ] +[[package]] +name = "vulkano" +version = "0.35.2" +source = "git+https://github.com/galister/vulkano.git?rev=cf7f92867928a56ce16b376037c1120f2b167678#cf7f92867928a56ce16b376037c1120f2b167678" +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", + "vulkano-macros", +] + [[package]] name = "vulkano-macros" version = "0.35.0" -source = "git+https://github.com/galister/vulkano.git?rev=ee170056e0402e18eb352df36894aa1f1d35aaad#ee170056e0402e18eb352df36894aa1f1d35aaad" +source = "git+https://github.com/galister/vulkano.git?rev=cf7f92867928a56ce16b376037c1120f2b167678#cf7f92867928a56ce16b376037c1120f2b167678" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6076,7 +6076,7 @@ dependencies = [ "quote", "shaderc", "syn 2.0.113", - "vulkano 0.35.2", + "vulkano 0.35.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -6374,7 +6374,7 @@ dependencies = [ "tracing", "tracing-subscriber", "uuid", - "vulkano 0.35.0", + "vulkano 0.35.2 (git+https://github.com/galister/vulkano.git?rev=cf7f92867928a56ce16b376037c1120f2b167678)", "vulkano-shaders", "wayland-client", "wayvr-ipc", @@ -6466,7 +6466,7 @@ dependencies = [ "slotmap", "smallvec", "taffy", - "vulkano 0.35.0", + "vulkano 0.35.2 (git+https://github.com/galister/vulkano.git?rev=cf7f92867928a56ce16b376037c1120f2b167678)", "vulkano-shaders", ] diff --git a/Cargo.toml b/Cargo.toml index e8b31786..df914591 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,8 +47,8 @@ serde = { version = "1", features = ["derive"] } serde_json = "1.0.145" slotmap = "1.1.1" strum = { version = "0.27.2", features = ["derive"] } -# vulkano = { version = "0.35.2", default-features = false, features = [ -vulkano = { git = "https://github.com/galister/vulkano.git", rev = "ee170056e0402e18eb352df36894aa1f1d35aaad", 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", ] } vulkano-shaders = "0.35.0"