From 1810e135a2083f0a79b477c772e97e8e26852932 Mon Sep 17 00:00:00 2001 From: "hinto.janai" Date: Thu, 9 May 2024 16:32:26 -0400 Subject: [PATCH] cargo.toml: update egui/wgpu --- Cargo.lock | 61 ++++++++++++++++++++++++++++++++++++------------------ Cargo.toml | 7 ++++--- 2 files changed, 45 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9406ff3..2e33967 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1340,6 +1340,17 @@ dependencies = [ "zeroize", ] +[[package]] +name = "d3d12" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" +dependencies = [ + "bitflags 2.4.2", + "libloading 0.8.0", + "winapi", +] + [[package]] name = "darling" version = "0.14.4" @@ -1605,9 +1616,9 @@ dependencies = [ [[package]] name = "ecolor" -version = "0.26.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03cfe80b1890e1a8cdbffc6044d6872e814aaf6011835a2a5e2db0e5c5c4ef4e" +checksum = "20930a432bbd57a6d55e07976089708d4893f3d556cf42a0d79e9e321fa73b10" dependencies = [ "bytemuck", "serde", @@ -1651,9 +1662,9 @@ dependencies = [ [[package]] name = "eframe" -version = "0.26.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c456c1bb6d13bf68b780257484703d750c70a23ff891ba35f4d6e23a4dbdf26f" +checksum = "020e2ccef6bbcec71dbc542f7eed64a5846fc3076727f5746da8fd307c91bab2" dependencies = [ "bytemuck", "cocoa", @@ -1687,9 +1698,9 @@ dependencies = [ [[package]] name = "egui" -version = "0.26.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180f595432a5b615fc6b74afef3955249b86cfea72607b40740a4cd60d5297d0" +checksum = "584c5d1bf9a67b25778a3323af222dbe1a1feb532190e103901187f92c7fe29a" dependencies = [ "accesskit", "ahash", @@ -1701,9 +1712,9 @@ dependencies = [ [[package]] name = "egui-wgpu" -version = "0.26.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f2d75e1e70228e7126f828bac05f9fe0e7ea88e9660c8cebe609bb114c61d4" +checksum = "469ff65843f88a702b731a1532b7d03b0e8e96d283e70f3a22b0e06c46cb9b37" dependencies = [ "bytemuck", "document-features", @@ -1719,9 +1730,9 @@ dependencies = [ [[package]] name = "egui-winit" -version = "0.26.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4d44f8d89f70d4480545eb2346b76ea88c3022e9f4706cebc799dbe8b004a2" +checksum = "2e3da0cbe020f341450c599b35b92de4af7b00abde85624fd16f09c885573609" dependencies = [ "accesskit_winit", "arboard", @@ -1736,9 +1747,9 @@ dependencies = [ [[package]] name = "egui_extras" -version = "0.26.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f4a6962241a76da5be5e64e41b851ee1c95fda11f76635522a3c82b119b5475" +checksum = "1b78779f35ded1a853786c9ce0b43fe1053e10a21ea3b23ebea411805ce41593" dependencies = [ "egui", "enum-map", @@ -1750,9 +1761,9 @@ dependencies = [ [[package]] name = "egui_glow" -version = "0.26.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08e3be8728b4c59493dbfec041c657e6725bdeafdbd49aef3f1dbb9e551fa01" +checksum = "e0e5d975f3c86edc3d35b1db88bb27c15dde7c55d3b5af164968ab5ede3f44ca" dependencies = [ "bytemuck", "egui", @@ -1791,9 +1802,9 @@ dependencies = [ [[package]] name = "emath" -version = "0.26.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6916301ecf80448f786cdf3eb51d9dbdd831538732229d49119e2d4312eaaf09" +checksum = "e4c3a552cfca14630702449d35f41c84a0d15963273771c6059175a803620f3f" dependencies = [ "bytemuck", "serde", @@ -1893,9 +1904,9 @@ dependencies = [ [[package]] name = "epaint" -version = "0.26.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77b9fdf617dd7f58b0c8e6e9e4a1281f730cde0831d40547da446b2bb76a47af" +checksum = "b381f8b149657a4acf837095351839f32cd5c4aec1817fc4df84e18d76334176" dependencies = [ "ab_glyph", "ahash", @@ -2670,6 +2681,7 @@ dependencies = [ "toml 0.7.6", "tor-rtcompat", "walkdir", + "wgpu", "winres", "zeroize", "zip", @@ -4326,6 +4338,12 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + [[package]] name = "raw-window-handle" version = "0.5.2" @@ -6709,9 +6727,9 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] name = "wgpu" -version = "0.19.3" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b1213b52478a7631d6e387543ed8f642bc02c578ef4e3b49aca2a29a7df0cb" +checksum = "cbd7311dbd2abcfebaabf1841a2824ed7c8be443a0f29166e5d3c6a53a762c01" dependencies = [ "arrayvec", "cfg-if", @@ -6767,10 +6785,12 @@ dependencies = [ "android_system_properties", "arrayvec", "ash", + "bit-set", "bitflags 2.4.2", "block", "cfg_aliases", "core-graphics-types", + "d3d12", "glow", "glutin_wgl_sys", "gpu-alloc", @@ -6789,6 +6809,7 @@ dependencies = [ "once_cell", "parking_lot", "profiling", + "range-alloc", "raw-window-handle 0.6.0", "renderdoc-sys", "rustc-hash", diff --git a/Cargo.toml b/Cargo.toml index 64ae592..aac0270 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,14 +33,14 @@ benri = "0.1.12" bytes = "1.4.0" dirs = "5.0.1" #-------------------------------------------------------------------------------- -egui = "0.26.2" -egui_extras = { version = "0.26.2", features = ["image"] } +egui = "0.27.2" +egui_extras = { version = "0.27.2", features = ["image"] } ## 2023-12-28: https://github.com/hinto-janai/gupax/issues/68 ## ## 2024-03-18: Both `glow` and `wgpu` seem to crash: ## ## `wgpu` seems to crash on less computers though so... -eframe = { version = "0.26.2", features = ["wgpu"] } +eframe = { version = "0.27.2", features = ["wgpu"] } ## 2023-02-06: The below gets fixed by using the [wgpu] backend instead of [glow] ## It also fixes crashes on CPU-based graphics. Only used for Windows. @@ -108,6 +108,7 @@ tls-api-native-tls = "0.9.0" [target.'cfg(windows)'.dependencies] zip = "0.6.6" is_elevated = "0.1.2" +wgpu = { version = "0.19.4", features = ["angle"] } # For Windows build (icon) [target.'cfg(windows)'.build-dependencies]