diff --git a/Cargo.lock b/Cargo.lock index f926e04..478e4d1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -434,6 +434,12 @@ name = "ecolor" version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfdf4e52dbbb615cfd30cf5a5265335c217b5fd8d669593cea74a517d9c605af" + +[[package]] +name = "ecolor" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d9d80ab06fc3e7ceb0a7c9b0514c9eba266c189e71044e7bac679e1736a7cb" dependencies = [ "bytemuck", ] @@ -445,23 +451,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bd69fed5fcf4fbb8225b24e80ea6193b61e17a625db105ef0c4d71dde6eb8b7" dependencies = [ "ahash", - "epaint", + "epaint 0.23.0", "log", "nohash-hasher", ] +[[package]] +name = "egui" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e46df77bb493b9ead5733540efdd2a1b0c18a5f75915921fc734495108172a5" +dependencies = [ + "ahash", + "epaint 0.24.0", + "nohash-hasher", +] + [[package]] name = "egui-wgpu" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62d4c9ab93d9528c184ef1d695c8c99b2e6d50833696ec3f513063efeee0fe77" +checksum = "2921b301f5aec17bc8601a01d27897589050094bd240eef3f10736ca065a5ae1" dependencies = [ "bytemuck", - "epaint", + "egui 0.24.0", + "epaint 0.24.0", "log", "thiserror", "type-map", - "wgpu", + "wgpu 0.18.0", "winit", ] @@ -471,7 +489,7 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c15479a96d9fadccf5dac690bdc6373b97b8e1c0dd28367058f25a5298da0195" dependencies = [ - "egui", + "egui 0.23.0", "log", "raw-window-handle", "web-time", @@ -483,6 +501,12 @@ name = "emath" version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0" + +[[package]] +name = "emath" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df747beaedee141dc3950edc68a156c0e548c92fe1a92f0a51c1bdca3d6a054d" dependencies = [ "bytemuck", ] @@ -508,14 +532,28 @@ checksum = "58067b840d009143934d91d8dcb8ded054d8301d7c11a517ace0a99bb1e1595e" dependencies = [ "ab_glyph", "ahash", - "bytemuck", - "ecolor", - "emath", + "ecolor 0.23.0", + "emath 0.23.0", "log", "nohash-hasher", "parking_lot", ] +[[package]] +name = "epaint" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f370b53e435fc235243174f3b2bf68a4b0202f3885cece16ad4aecd03222c4" +dependencies = [ + "ab_glyph", + "ahash", + "bytemuck", + "ecolor 0.24.0", + "emath 0.24.0", + "nohash-hasher", + "parking_lot", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -563,6 +601,18 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "spin", +] + [[package]] name = "foreign-types" version = "0.3.2" @@ -649,6 +699,18 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" +[[package]] +name = "futures-core" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + +[[package]] +name = "futures-sink" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" + [[package]] name = "generic-array" version = "0.14.7" @@ -659,12 +721,36 @@ dependencies = [ "version_check", ] +[[package]] +name = "getrandom" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + [[package]] name = "gimli" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + [[package]] name = "glow" version = "0.12.3" @@ -677,6 +763,27 @@ dependencies = [ "web-sys", ] +[[package]] +name = "glow" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "886c2a30b160c4c6fec8f987430c26b526b7988ca71f664e6a699ddf6f9601e4" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glutin_wgl_sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +dependencies = [ + "gl_generator", +] + [[package]] name = "gpu-alloc" version = "0.6.0" @@ -706,7 +813,21 @@ dependencies = [ "log", "thiserror", "winapi 0.3.9", - "windows", + "windows 0.44.0", +] + +[[package]] +name = "gpu-allocator" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40fe17c8a05d60c38c0a4e5a3c802f2f1ceb66b76c67d96ffb34bef0475a7fad" +dependencies = [ + "backtrace", + "log", + "presser", + "thiserror", + "winapi 0.3.9", + "windows 0.51.1", ] [[package]] @@ -931,6 +1052,23 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "khronos-egl" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" +dependencies = [ + "libc", + "libloading 0.8.1", + "pkg-config", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + [[package]] name = "kqueue" version = "1.0.8" @@ -968,13 +1106,13 @@ name = "lib" version = "0.1.0" dependencies = [ "bytemuck", - "egui", + "egui 0.23.0", "instant", "log", "nanorand", "pollster", "rust-embed", - "wgpu", + "wgpu 0.17.1", "winit", ] @@ -1085,6 +1223,21 @@ dependencies = [ "paste", ] +[[package]] +name = "metal" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +dependencies = [ + "bitflags 2.4.1", + "block", + "core-graphics-types", + "foreign-types 0.5.0", + "log", + "objc", + "paste", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -1176,11 +1329,34 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "naga" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cd05939c491da968a42986204b7431678be21fdcd4b10cc84997ba130ada5a4" +dependencies = [ + "bit-set", + "bitflags 2.4.1", + "codespan-reporting", + "hexf-parse", + "indexmap 2.1.0", + "log", + "num-traits", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + [[package]] name = "nanorand" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] [[package]] name = "ndk" @@ -1489,6 +1665,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" +[[package]] +name = "presser" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" + [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -1741,6 +1923,15 @@ dependencies = [ "wayland-protocols", ] +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + [[package]] name = "spirv" version = "0.2.0+1.5.4" @@ -2092,7 +2283,7 @@ dependencies = [ "cfg-if 1.0.0", "js-sys", "log", - "naga", + "naga 0.13.0", "parking_lot", "profiling", "raw-window-handle", @@ -2101,9 +2292,34 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", + "wgpu-core 0.17.1", + "wgpu-hal 0.17.2", + "wgpu-types 0.17.0", +] + +[[package]] +name = "wgpu" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30e7d227c9f961f2061c26f4cb0fbd4df0ef37e056edd0931783599d6c94ef24" +dependencies = [ + "arrayvec", + "cfg-if 1.0.0", + "flume", + "js-sys", + "log", + "naga 0.14.1", + "parking_lot", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core 0.18.1", + "wgpu-hal 0.18.0", + "wgpu-types 0.18.0", ] [[package]] @@ -2117,7 +2333,7 @@ dependencies = [ "bitflags 2.4.1", "codespan-reporting", "log", - "naga", + "naga 0.13.0", "parking_lot", "profiling", "raw-window-handle", @@ -2125,8 +2341,31 @@ dependencies = [ "smallvec", "thiserror", "web-sys", - "wgpu-hal", - "wgpu-types", + "wgpu-hal 0.17.2", + "wgpu-types 0.17.0", +] + +[[package]] +name = "wgpu-core" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef91c1d62d1e9e81c79e600131a258edf75c9531cbdbde09c44a011a47312726" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.4.1", + "codespan-reporting", + "log", + "naga 0.14.1", + "parking_lot", + "profiling", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal 0.18.0", + "wgpu-types 0.18.0", ] [[package]] @@ -2143,19 +2382,62 @@ dependencies = [ "block", "core-graphics-types", "d3d12", - "glow", + "glow 0.12.3", + "gpu-alloc", + "gpu-allocator 0.22.0", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl 4.1.0", + "libc", + "libloading 0.8.1", + "log", + "metal 0.26.0", + "naga 0.13.0", + "objc", + "parking_lot", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types 0.17.0", + "winapi 0.3.9", +] + +[[package]] +name = "wgpu-hal" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e30b9a8155c83868e82a8c5d3ce899de6c3961d2ef595de8fc168a1677fc2d8" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.4.1", + "block", + "core-graphics-types", + "d3d12", + "glow 0.13.0", + "glutin_wgl_sys", "gpu-alloc", - "gpu-allocator", + "gpu-allocator 0.23.0", "gpu-descriptor", "hassle-rs", "js-sys", - "khronos-egl", + "khronos-egl 6.0.0", "libc", "libloading 0.8.1", "log", - "metal", - "naga", + "metal 0.27.0", + "naga 0.14.1", "objc", + "once_cell", "parking_lot", "profiling", "range-alloc", @@ -2166,7 +2448,7 @@ dependencies = [ "thiserror", "wasm-bindgen", "web-sys", - "wgpu-types", + "wgpu-types 0.18.0", "winapi 0.3.9", ] @@ -2176,7 +2458,7 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "console_log", - "egui", + "egui 0.23.0", "egui-wgpu", "egui-winit", "env_logger", @@ -2188,7 +2470,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu", + "wgpu 0.17.1", "winit", ] @@ -2203,6 +2485,17 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wgpu-types" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d5ed5f0edf0de351fe311c53304986315ce866f394a2e6df0c4b3c70774bcdd" +dependencies = [ + "bitflags 2.4.1", + "js-sys", + "web-sys", +] + [[package]] name = "widestring" version = "1.0.2" @@ -2261,6 +2554,25 @@ dependencies = [ "windows-targets 0.42.2", ] +[[package]] +name = "windows" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +dependencies = [ + "windows-core", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + [[package]] name = "windows-sys" version = "0.45.0" diff --git a/Cargo.toml b/Cargo.toml index 72b6b51..fda732e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,7 @@ hot-lib-reloader = { version = "^0.6", optional = true } env_logger = "0.10.0" wasm-bindgen = "0.2.88" -egui-wgpu = { version = "0.23.0", features = ["winit"] } +egui-wgpu = { version = "0.24.0", features = ["winit"] } egui-winit = { version = "0.23.0", default-features = false }