diff --git a/Cargo.lock b/Cargo.lock index 7b24b43c1..8d95fb27d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -177,6 +177,15 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + [[package]] name = "ash" version = "0.38.0+1.3.281" @@ -195,7 +204,7 @@ dependencies = [ "futures-channel", "futures-util", "rand", - "raw-window-handle", + "raw-window-handle 0.6.2", "serde", "serde_repr", "url", @@ -660,7 +669,7 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", - "libloading", + "libloading 0.8.5", ] [[package]] @@ -691,7 +700,7 @@ version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", "syn", @@ -951,6 +960,15 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "crossbeam-queue" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.20" @@ -1028,7 +1046,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading", + "libloading 0.8.5", ] [[package]] @@ -1537,12 +1555,12 @@ dependencies = [ "glutin_egl_sys", "glutin_glx_sys", "glutin_wgl_sys", - "libloading", + "libloading 0.8.5", "objc2", "objc2-app-kit", "objc2-foundation", "once_cell", - "raw-window-handle", + "raw-window-handle 0.6.2", "wayland-sys", "windows-sys 0.52.0", "x11-dl", @@ -1556,7 +1574,7 @@ checksum = "85edca7075f8fc728f28cb8fbb111a96c3b89e930574369e3e9c27eb75d3788f" dependencies = [ "cfg_aliases", "glutin", - "raw-window-handle", + "raw-window-handle 0.6.2", "winit", ] @@ -1595,7 +1613,7 @@ version = "0.1.0" dependencies = [ "aarch64", "applevisor-sys", - "ash", + "ash 0.38.0+1.3.281", "ashpd", "bitfield-struct", "ciborium", @@ -1617,7 +1635,7 @@ dependencies = [ "obfw", "objc", "open", - "raw-window-handle", + "raw-window-handle 0.6.2", "redb", "serde", "slint", @@ -1637,6 +1655,7 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ + "bytemuck", "cfg-if", "crunchy", ] @@ -1652,6 +1671,12 @@ dependencies = [ "rayon", ] +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + [[package]] name = "heck" version = "0.5.0" @@ -1710,7 +1735,7 @@ dependencies = [ "input", "memmap2", "nix", - "raw-window-handle", + "raw-window-handle 0.6.2", "xkbcommon", ] @@ -1748,7 +1773,7 @@ dependencies = [ "lyon_path", "once_cell", "pin-weak", - "raw-window-handle", + "raw-window-handle 0.6.2", "scoped-tls-hkt", "scopeguard", "softbuffer", @@ -1766,7 +1791,7 @@ dependencies = [ "cfg-if", "derive_more", "fontdb", - "libloading", + "libloading 0.8.5", ] [[package]] @@ -1825,7 +1850,7 @@ dependencies = [ "pin-project", "pin-weak", "portable-atomic", - "raw-window-handle", + "raw-window-handle 0.6.2", "resvg", "rgb", "scoped-tls-hkt", @@ -1858,6 +1883,7 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d6e478f22705e017db15416434d5dec7b138b6a1853baacdb489b8b558c1eb" dependencies = [ + "ash 0.37.3+1.3.251", "bytemuck", "cfg-if", "cfg_aliases", @@ -1877,13 +1903,14 @@ dependencies = [ "objc", "once_cell", "pin-weak", - "raw-window-handle", + "raw-window-handle 0.6.2", "raw-window-metal", "scoped-tls-hkt", "skia-safe", "softbuffer", "unicode-segmentation", "vtable", + "vulkano", "windows", ] @@ -2266,6 +2293,16 @@ version = "0.2.164" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + [[package]] name = "libloading" version = "0.8.5" @@ -2346,6 +2383,16 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + [[package]] name = "log" version = "0.4.22" @@ -2498,7 +2545,7 @@ dependencies = [ "log", "ndk-sys", "num_enum", - "raw-window-handle", + "raw-window-handle 0.6.2", "thiserror 1.0.66", ] @@ -2898,6 +2945,29 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.7", + "smallvec", + "windows-targets 0.52.6", +] + [[package]] name = "paste" version = "1.0.15" @@ -3108,6 +3178,12 @@ dependencies = [ "getrandom", ] +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + [[package]] name = "raw-window-handle" version = "0.6.2" @@ -3454,7 +3530,7 @@ dependencies = [ "bindgen", "cc", "flate2", - "heck", + "heck 0.5.0", "lazy_static", "regex", "serde_json", @@ -3495,7 +3571,7 @@ dependencies = [ "num-traits", "once_cell", "pin-weak", - "raw-window-handle", + "raw-window-handle 0.6.2", "slint-macros", "vtable", ] @@ -3613,7 +3689,7 @@ dependencies = [ "objc2", "objc2-foundation", "objc2-quartz-core", - "raw-window-handle", + "raw-window-handle 0.6.2", "redox_syscall 0.5.7", "rustix", "tiny-xlib", @@ -3677,7 +3753,7 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", @@ -3801,6 +3877,16 @@ dependencies = [ "syn", ] +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + [[package]] name = "tiff" version = "0.9.1" @@ -3846,7 +3932,7 @@ checksum = "0324504befd01cab6e0c994f34b2ffa257849ee019d3fb3b64fb2c858887d89e" dependencies = [ "as-raw-xcb-connection", "ctor-lite", - "libloading", + "libloading 0.8.5", "pkg-config", "tracing", ] @@ -4127,6 +4213,15 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "vk-parse" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81086c28be67a8759cd80cbb3c8f7b520e0874605fc5eb74d5a1c9c2d1878e79" +dependencies = [ + "xml-rs", +] + [[package]] name = "vtable" version = "0.2.0" @@ -4150,6 +4245,35 @@ dependencies = [ "syn", ] +[[package]] +name = "vulkano" +version = "0.34.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f4278f76307b3c388679234b397b4f90de29cdba53873c26b624ed82653d75" +dependencies = [ + "ahash", + "ash 0.37.3+1.3.251", + "bytemuck", + "core-graphics-types 0.1.3", + "crossbeam-queue", + "half", + "heck 0.4.1", + "indexmap", + "libloading 0.8.5", + "objc", + "once_cell", + "parking_lot", + "proc-macro2", + "quote", + "raw-window-handle 0.5.2", + "regex", + "serde", + "serde_json", + "smallvec", + "thread_local", + "vk-parse", +] + [[package]] name = "walkdir" version = "2.5.0" @@ -4728,7 +4852,7 @@ dependencies = [ "orbclient", "percent-encoding", "pin-project", - "raw-window-handle", + "raw-window-handle 0.6.2", "redox_syscall 0.4.1", "rustix", "sctk-adwaita", @@ -4810,7 +4934,7 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading", + "libloading 0.8.5", "once_cell", "rustix", "x11rb-protocol", diff --git a/gui/Cargo.toml b/gui/Cargo.toml index 74a77b4dd..83b25e38d 100644 --- a/gui/Cargo.toml +++ b/gui/Cargo.toml @@ -17,7 +17,6 @@ gdbstub = "0.7.3" gdbstub_arch = "0.3.1" humansize = "2.1.3" i-slint-core = "=1.8.0" -i-slint-renderer-skia = { version = "=1.8.0", features = ["wayland", "x11"] } libc = "0.2.164" num_enum = "0.7.3" obconf = { path = "../src/obconf", features = ["serde", "virt"] } @@ -51,6 +50,17 @@ aarch64 = { path = "../arch/aarch64" } [target.'cfg(target_arch = "x86_64")'.dependencies] x86-64 = { path = "../arch/x86-64" } +[target.'cfg(target_os = "linux")'.dependencies.i-slint-renderer-skia] +version = "=1.8.0" +features = ["vulkan", "wayland", "x11"] + +[target.'cfg(target_os = "windows")'.dependencies.i-slint-renderer-skia] +version = "=1.8.0" +features = ["vulkan"] + +[target.'cfg(not(any(target_os = "linux", target_os = "windows")))'.dependencies.i-slint-renderer-skia] +version = "=1.8.0" + [target.'cfg(not(target_os = "macos"))'.dependencies.ash] version = "0.38.0" features = ["linked", "std"]