From c06ec6d974aa9b7f9be383a3221035c01cea98b5 Mon Sep 17 00:00:00 2001 From: HavenOfTheRaven <125735960+HavenOfTheRaven@users.noreply.github.com> Date: Sun, 16 Jun 2024 08:49:45 -0600 Subject: [PATCH] Update Dependencies (#48) * updated dependencies * updated vulkano and ash with fixes --- Cargo.lock | 261 ++++++++++++++++++++++++++++++++++-------------- Cargo.toml | 36 +++---- src/graphics.rs | 40 ++++---- 3 files changed, 223 insertions(+), 114 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e819514..3b6cc42 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -78,9 +78,9 @@ dependencies = [ [[package]] name = "android-activity" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" dependencies = [ "android-properties", "bitflags 2.5.0", @@ -90,9 +90,9 @@ dependencies = [ "jni-sys", "libc", "log", - "ndk", + "ndk 0.9.0", "ndk-context", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", "thiserror", ] @@ -225,11 +225,11 @@ checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" [[package]] name = "ash" -version = "0.37.3+1.3.251" +version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading 0.7.4", + "libloading 0.8.3", ] [[package]] @@ -603,22 +603,12 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" -dependencies = [ - "objc-sys", -] - [[package]] name = "block2" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ - "block-sys", "objc2", ] @@ -747,6 +737,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" version = "0.4.38" @@ -796,9 +792,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.4" +version = "4.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "a9689a29b593160de5bc4aacab7b5d54fb52231de70122626c178e6a368994c7" dependencies = [ "clap_builder", "clap_derive", @@ -806,9 +802,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "2e5387378c84f6faa26890ebf9f0a92989f8873d4d380467bcd0d8d8620424df" dependencies = [ "anstream", "anstyle", @@ -818,9 +814,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -1022,7 +1018,7 @@ dependencies = [ "js-sys", "libc", "mach2", - "ndk", + "ndk 0.8.0", "ndk-context", "oboe", "wasm-bindgen", @@ -1272,6 +1268,12 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" +[[package]] +name = "dpi" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" + [[package]] name = "drm-fourcc" version = "2.2.0" @@ -1746,17 +1748,6 @@ dependencies = [ "cc", ] -[[package]] -name = "icrate" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" -dependencies = [ - "block2", - "dispatch", - "objc2", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -2211,7 +2202,21 @@ dependencies = [ "bitflags 2.5.0", "jni-sys", "log", - "ndk-sys", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" +dependencies = [ + "bitflags 2.5.0", + "jni-sys", + "log", + "ndk-sys 0.6.0+11769913", "num_enum", "raw-window-handle", "thiserror", @@ -2232,6 +2237,15 @@ dependencies = [ "jni-sys", ] +[[package]] +name = "ndk-sys" +version = "0.6.0+11769913" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" +dependencies = [ + "jni-sys", +] + [[package]] name = "nix" version = "0.26.4" @@ -2265,7 +2279,7 @@ checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.5.0", "cfg-if", - "cfg_aliases", + "cfg_aliases 0.1.1", "libc", ] @@ -2364,19 +2378,97 @@ checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" [[package]] name = "objc2" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ "objc-sys", "objc2-encode", ] [[package]] -name = "objc2-encode" -version = "3.0.0" +name = "objc2-app-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.5.0", + "block2", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.5.0", + "block2", + "dispatch", + "libc", + "objc2", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] [[package]] name = "object" @@ -2394,7 +2486,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" dependencies = [ "jni 0.21.1", - "ndk", + "ndk 0.8.0", "ndk-context", "num-derive", "num-traits", @@ -2641,6 +2733,26 @@ dependencies = [ "siphasher", ] +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "pin-project-lite" version = "0.2.14" @@ -2865,15 +2977,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -2923,12 +3026,13 @@ checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "rodio" -version = "0.17.3" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b1bb7b48ee48471f55da122c0044fcc7600cfcc85db88240b89cb832935e611" +checksum = "d1fceb9d127d515af1586d8d0cc601e1245bdb0af38e75c865a156290184f5b3" dependencies = [ "cpal", "hound", + "thiserror", ] [[package]] @@ -3050,9 +3154,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" +checksum = "7de61fa7334ee8ee1f5c3c58dcc414fb9361e7e8f5bff9d45f4d69eeb89a7169" dependencies = [ "ab_glyph", "log", @@ -3215,6 +3319,12 @@ dependencies = [ "autocfg", ] +[[package]] +name = "slabbin" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8305086044614627ed85432d27b87cf9fc047204eaa036a11de6cf0120f273" + [[package]] name = "slice-of-array" version = "0.3.2" @@ -3659,7 +3769,7 @@ dependencies = [ [[package]] name = "vulkano" version = "0.34.0" -source = "git+https://github.com/vulkano-rs/vulkano?rev=94f50f1#94f50f18bd25971ea123adb8b5782ad65a8f085c" +source = "git+https://github.com/vulkano-rs/vulkano?rev=b9f3e89#b9f3e893005078b5680cd1672037465a2b5f3133" dependencies = [ "ahash", "ash", @@ -3670,15 +3780,16 @@ dependencies = [ "heck 0.4.1", "indexmap 2.2.6", "libloading 0.8.3", + "nom", "objc", "once_cell", "parking_lot", "proc-macro2", "quote", "raw-window-handle", - "regex", "serde", "serde_json", + "slabbin", "smallvec", "thread_local", "vk-parse", @@ -3688,7 +3799,7 @@ dependencies = [ [[package]] name = "vulkano-macros" version = "0.34.0" -source = "git+https://github.com/vulkano-rs/vulkano?rev=94f50f1#94f50f18bd25971ea123adb8b5782ad65a8f085c" +source = "git+https://github.com/vulkano-rs/vulkano?rev=b9f3e89#b9f3e893005078b5680cd1672037465a2b5f3133" dependencies = [ "proc-macro-crate 2.0.2", "proc-macro2", @@ -3699,7 +3810,7 @@ dependencies = [ [[package]] name = "vulkano-shaders" version = "0.34.0" -source = "git+https://github.com/vulkano-rs/vulkano?rev=94f50f1#94f50f18bd25971ea123adb8b5782ad65a8f085c" +source = "git+https://github.com/vulkano-rs/vulkano?rev=b9f3e89#b9f3e893005078b5680cd1672037465a2b5f3133" dependencies = [ "ahash", "heck 0.4.1", @@ -3913,9 +4024,9 @@ dependencies = [ [[package]] name = "web-time" -version = "0.2.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -4219,9 +4330,9 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winit" -version = "0.29.15" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" +checksum = "ea9e6d5d66cbf702e0dd820302144f51b69a95acdc495dd98ca280ff206562b1" dependencies = [ "ahash", "android-activity", @@ -4229,27 +4340,29 @@ dependencies = [ "bitflags 2.5.0", "bytemuck", "calloop", - "cfg_aliases", + "cfg_aliases 0.2.1", + "concurrent-queue", "core-foundation", "core-graphics", "cursor-icon", - "icrate", + "dpi", "js-sys", "libc", - "log", "memmap2 0.9.4", - "ndk", - "ndk-sys", + "ndk 0.9.0", "objc2", - "once_cell", + "objc2-app-kit", + "objc2-foundation", "orbclient", "percent-encoding", + "pin-project", "raw-window-handle", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "rustix", "sctk-adwaita", "smithay-client-toolkit", "smol_str", + "tracing", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", @@ -4259,7 +4372,7 @@ dependencies = [ "wayland-protocols-plasma", "web-sys", "web-time", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "x11-dl", "x11rb", "xkbcommon-dl", diff --git a/Cargo.toml b/Cargo.toml index a7b1853..f816d02 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,26 +10,26 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = "1.0.79" -ash = "^0.37.2" -chrono = "0.4.29" +anyhow = "1.0.86" +ash = "^0.38.0" +chrono = "0.4.38" chrono-tz = "0.9.0" -clap = { version = "4.5.1", features = ["derive"] } +clap = { version = "4.5.6", features = ["derive"] } config = "0.14.0" cstr = "0.2.12" -ctrlc = { version = "3.4.2", features = ["termination"] } +ctrlc = { version = "3.4.4", features = ["termination"] } dbus = { version = "0.9.7" } -flexi_logger = "0.28.0" +flexi_logger = "0.28.1" fontconfig-rs = "0.1.1" freetype-rs = "0.36.0" -futures = "0.3.29" +futures = "0.3.30" glam = { version = "0.27.0", features = ["approx", "serde"] } idmap = { version = "0.2.21", features = ["serde"] } idmap-derive = "0.1.2" input-linux = "0.6.0" json = { version = "0.12.4", optional = true } json5 = "0.4.1" -libc = "0.2.153" +libc = "0.2.155" libloading = "0.8.3" log = "0.4.21" once_cell = "1.19.0" @@ -38,23 +38,23 @@ ovr_overlay = { features = [ "ovr_input", "ovr_system", ], git = "https://github.com/galister/ovr_overlay_oyasumi", optional = true } -regex = "1.9.5" -rodio = { version = "0.17.1", default-features = false, features = [ +regex = "1.10.4" +rodio = { version = "0.18.1", default-features = false, features = [ "wav", "hound", ] } rosc = { version = "0.10.1", optional = true } -serde = { version = "1.0.188", features = ["derive", "rc"] } -serde_json = "1.0.113" +serde = { version = "1.0.203", features = ["derive", "rc"] } +serde_json = "1.0.117" serde_yaml = "0.9.34" -smallvec = "1.11.0" +smallvec = "1.13.2" strum = { version = "0.26.2", features = ["derive"] } -sysinfo = { version = "0.30.0" } -thiserror = "1.0.56" -vulkano = { git = "https://github.com/vulkano-rs/vulkano", rev = "94f50f1" } -vulkano-shaders = { git = "https://github.com/vulkano-rs/vulkano", rev = "94f50f1" } +sysinfo = { version = "0.30.12" } +thiserror = "1.0.61" +vulkano = { git = "https://github.com/vulkano-rs/vulkano", rev = "b9f3e89" } +vulkano-shaders = { git = "https://github.com/vulkano-rs/vulkano", rev = "b9f3e89" } wlx-capture = { git = "https://github.com/galister/wlx-capture", tag = "v0.3.11", default-features = false } -winit = { version = "0.29.15", optional = true } +winit = { version = "0.30.0", optional = true } xdg = "2.5.2" log-panics = { version = "2.1.0", features = ["with-backtrace"] } serde_json5 = "0.1.0" diff --git a/src/graphics.rs b/src/graphics.rs index 762f89d..1e75061 100644 --- a/src/graphics.rs +++ b/src/graphics.rs @@ -42,7 +42,7 @@ use vulkano::{ allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet, }, device::{ - physical::PhysicalDevice, Device, DeviceCreateInfo, DeviceExtensions, Features, Queue, + physical::PhysicalDevice, Device, DeviceCreateInfo, DeviceExtensions, DeviceFeatures, Queue, QueueCreateInfo, QueueFlags, }, format::Format, @@ -196,7 +196,7 @@ impl WlxGraphics { let target_version = vulkano::Version::V1_3; let library = get_vulkan_library(); - let vk_app_info_raw = vk::ApplicationInfo::builder() + let vk_app_info_raw = vk::ApplicationInfo::default() .application_version(0) .engine_version(0) .api_version(vk_target_version); @@ -206,7 +206,7 @@ impl WlxGraphics { .create_vulkan_instance( system, get_instance_proc_addr, - &vk::InstanceCreateInfo::builder() + &vk::InstanceCreateInfo::default() .application_info(&vk_app_info_raw) .enabled_extension_names(&instance_extensions_raw) as *const _ as *const _, @@ -278,26 +278,23 @@ impl WlxGraphics { }) .collect::>(); - let features = Features { + let features = DeviceFeatures { dynamic_rendering: true, ..Default::default() }; let queue_priorities = [1.0]; - let queue_create_infos = [vk::DeviceQueueCreateInfo::builder() + let queue_create_infos = [vk::DeviceQueueCreateInfo::default() .queue_family_index(queue_family_index) - .queue_priorities(&queue_priorities) - .build()]; + .queue_priorities(&queue_priorities)]; - let mut device_create_info = vk::DeviceCreateInfo::builder() + let mut device_create_info = vk::DeviceCreateInfo::default() .queue_create_infos(&queue_create_infos) - .enabled_extension_names(&device_extensions_raw) - .build(); + .enabled_extension_names(&device_extensions_raw); - let mut dynamic_rendering = PhysicalDeviceDynamicRenderingFeatures::builder() - .dynamic_rendering(true) - .build(); + let mut dynamic_rendering = PhysicalDeviceDynamicRenderingFeatures::default() + .dynamic_rendering(true); dynamic_rendering.p_next = device_create_info.p_next as _; device_create_info.p_next = (&mut dynamic_rendering) as *const _ as *const c_void; @@ -456,9 +453,9 @@ impl WlxGraphics { physical_device, DeviceCreateInfo { enabled_extensions: my_extensions, - enabled_features: Features { + enabled_features: DeviceFeatures { dynamic_rendering: true, - ..Features::empty() + ..DeviceFeatures::empty() }, queue_create_infos: vec![QueueCreateInfo { queue_family_index, @@ -580,9 +577,9 @@ impl WlxGraphics { physical_device, DeviceCreateInfo { enabled_extensions: my_extensions, - enabled_features: Features { + enabled_features: DeviceFeatures { dynamic_rendering: true, - ..Features::empty() + ..DeviceFeatures::empty() }, queue_create_infos: vec![QueueCreateInfo { queue_family_index, @@ -988,9 +985,8 @@ impl WlxGraphics { (fns.v1_0.queue_submit)( self.queue.handle(), 1, - [SubmitInfo::builder() - .command_buffers(&[command_buffer.handle()]) - .build()] + [SubmitInfo::default() + .command_buffers(&[command_buffer.handle()])] .as_ptr(), fence.handle(), ) @@ -1144,7 +1140,7 @@ impl WlxPipeline { let vep = vert.entry_point("main").unwrap(); // want panic let fep = frag.entry_point("main").unwrap(); // want panic - let vertex_input_state = Vert2Uv::per_vertex().definition(&vep.info().input_interface)?; + let vertex_input_state = Vert2Uv::per_vertex().definition(&vep)?; let stages = smallvec![ vulkano::pipeline::PipelineShaderStageCreateInfo::new(vep), @@ -1301,7 +1297,7 @@ impl WlxPipeline { let vep = vert.entry_point("main").unwrap(); // want panic let fep = frag.entry_point("main").unwrap(); // want panic - let vertex_input_state = Vert2Uv::per_vertex().definition(&vep.info().input_interface)?; + let vertex_input_state = Vert2Uv::per_vertex().definition(&vep)?; let stages = smallvec![ vulkano::pipeline::PipelineShaderStageCreateInfo::new(vep),