diff --git a/Cargo.lock b/Cargo.lock index 360b06b..46b94b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -137,7 +137,7 @@ dependencies = [ "cfb", "env_logger", "flate2", - "image 0.25.1", + "image", "lazy_static", "log", "num-traits", @@ -847,7 +847,7 @@ version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "syn 2.0.66", @@ -868,36 +868,6 @@ dependencies = [ "error-code", ] -[[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation", - "core-graphics-types", - "libc", - "objc", -] - [[package]] name = "codespan-reporting" version = "0.11.1" @@ -908,12 +878,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - [[package]] name = "colorchoice" version = "1.0.1" @@ -1041,10 +1005,11 @@ dependencies = [ [[package]] name = "cosmic-text" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75acbfb314aeb4f5210d379af45ed1ec2c98c7f1790bf57b8a4c562ac0c51b71" +checksum = "c578f2b9abb4d5f3fbb12aba4008084d435dc6a8425c195cfe0b3594bfea0c25" dependencies = [ + "bitflags 2.5.0", "fontdb", "libm", "log", @@ -1054,6 +1019,7 @@ dependencies = [ "self_cell", "swash", "sys-locale", + "ttf-parser 0.20.0", "unicode-bidi", "unicode-linebreak", "unicode-script", @@ -1106,17 +1072,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" -[[package]] -name = "d3d12" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" -dependencies = [ - "bitflags 2.5.0", - "libloading 0.8.3", - "winapi", -] - [[package]] name = "derivative" version = "2.2.0" @@ -1198,16 +1153,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" -[[package]] -name = "duplicate" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de78e66ac9061e030587b2a2e75cc88f22304913c907b11307bca737141230cb" -dependencies = [ - "heck 0.4.1", - "proc-macro-error", -] - [[package]] name = "ecad-cli" version = "0.1.0" @@ -1226,7 +1171,6 @@ dependencies = [ "bytemuck", "eframe", "egui", - "egui_dock", "egui_extras", "egui_plot", "env_logger", @@ -1242,8 +1186,7 @@ dependencies = [ [[package]] name = "ecolor" version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20930a432bbd57a6d55e07976089708d4893f3d556cf42a0d79e9e321fa73b10" +source = "git+https://github.com/emilk/egui.git?branch=emilk/wgpu-0.20#3dca4c667f30fe7199433d3607efbe15c76a1cb6" dependencies = [ "bytemuck", "serde", @@ -1252,29 +1195,29 @@ dependencies = [ [[package]] name = "eframe" version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020e2ccef6bbcec71dbc542f7eed64a5846fc3076727f5746da8fd307c91bab2" +source = "git+https://github.com/emilk/egui.git?branch=emilk/wgpu-0.20#3dca4c667f30fe7199433d3607efbe15c76a1cb6" dependencies = [ + "ahash", "bytemuck", - "cocoa", "directories-next", "document-features", "egui", "egui-wgpu", "egui-winit", "egui_glow", - "image 0.24.9", + "image", "js-sys", "log", - "objc", + "objc2 0.5.2", + "objc2-app-kit", + "objc2-foundation", "parking_lot", "percent-encoding", "pollster", - "raw-window-handle 0.6.2", + "raw-window-handle", "ron", "serde", "static_assertions", - "thiserror", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -1287,11 +1230,11 @@ dependencies = [ [[package]] name = "egui" version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "584c5d1bf9a67b25778a3323af222dbe1a1feb532190e103901187f92c7fe29a" +source = "git+https://github.com/emilk/egui.git?branch=emilk/wgpu-0.20#3dca4c667f30fe7199433d3607efbe15c76a1cb6" dependencies = [ "accesskit", "ahash", + "emath", "epaint", "log", "nohash-hasher", @@ -1302,9 +1245,9 @@ dependencies = [ [[package]] name = "egui-wgpu" version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469ff65843f88a702b731a1532b7d03b0e8e96d283e70f3a22b0e06c46cb9b37" +source = "git+https://github.com/emilk/egui.git?branch=emilk/wgpu-0.20#3dca4c667f30fe7199433d3607efbe15c76a1cb6" dependencies = [ + "ahash", "bytemuck", "document-features", "egui", @@ -1320,14 +1263,14 @@ dependencies = [ [[package]] name = "egui-winit" version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e3da0cbe020f341450c599b35b92de4af7b00abde85624fd16f09c885573609" +source = "git+https://github.com/emilk/egui.git?branch=emilk/wgpu-0.20#3dca4c667f30fe7199433d3607efbe15c76a1cb6" dependencies = [ "accesskit_winit", + "ahash", "arboard", "egui", "log", - "raw-window-handle 0.6.2", + "raw-window-handle", "serde", "smithay-clipboard", "web-time", @@ -1335,23 +1278,12 @@ dependencies = [ "winit", ] -[[package]] -name = "egui_dock" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3b8d9a54c0ed60f2670ad387c269663b4771431f090fa586906cf5f0bc586f4" -dependencies = [ - "duplicate", - "egui", - "paste", -] - [[package]] name = "egui_extras" version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b78779f35ded1a853786c9ce0b43fe1053e10a21ea3b23ebea411805ce41593" +source = "git+https://github.com/emilk/egui.git?branch=emilk/wgpu-0.20#3dca4c667f30fe7199433d3607efbe15c76a1cb6" dependencies = [ + "ahash", "egui", "enum-map", "log", @@ -1362,9 +1294,9 @@ dependencies = [ [[package]] name = "egui_glow" version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0e5d975f3c86edc3d35b1db88bb27c15dde7c55d3b5af164968ab5ede3f44ca" +source = "git+https://github.com/emilk/egui.git?branch=emilk/wgpu-0.20#3dca4c667f30fe7199433d3607efbe15c76a1cb6" dependencies = [ + "ahash", "bytemuck", "egui", "glow", @@ -1378,17 +1310,16 @@ dependencies = [ [[package]] name = "egui_plot" version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7854b86dc1c2d352c5270db3d600011daa913d6b554141a03939761323288a1" +source = "git+https://github.com/emilk/egui.git?branch=emilk/wgpu-0.20#3dca4c667f30fe7199433d3607efbe15c76a1cb6" dependencies = [ + "ahash", "egui", ] [[package]] name = "emath" version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c3a552cfca14630702449d35f41c84a0d15963273771c6059175a803620f3f" +source = "git+https://github.com/emilk/egui.git?branch=emilk/wgpu-0.20#3dca4c667f30fe7199433d3607efbe15c76a1cb6" dependencies = [ "bytemuck", "serde", @@ -1479,8 +1410,7 @@ dependencies = [ [[package]] name = "epaint" version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b381f8b149657a4acf837095351839f32cd5c4aec1817fc4df84e18d76334176" +source = "git+https://github.com/emilk/egui.git?branch=emilk/wgpu-0.20#3dca4c667f30fe7199433d3607efbe15c76a1cb6" dependencies = [ "ab_glyph", "ahash", @@ -1638,16 +1568,16 @@ dependencies = [ [[package]] name = "fontdb" -version = "0.15.0" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020e203f177c0fb250fb19455a252e838d2bbbce1f80f25ecc42402aafa8cd38" +checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" dependencies = [ "fontconfig-parser", "log", - "memmap2 0.8.0", + "memmap2", "slotmap", "tinyvec", - "ttf-parser 0.19.2", + "ttf-parser 0.20.0", ] [[package]] @@ -1841,12 +1771,12 @@ dependencies = [ [[package]] name = "glyphon" version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a62d0338e4056db6a73221c2fb2e30619452f6ea9651bac4110f51b0f7a7581" +source = "git+https://github.com/grovesNL/glyphon.git#2a457087674b0c124d37c85bc6769ba27dcde173" dependencies = [ "cosmic-text", "etagere", "lru", + "rustc-hash", "wgpu", ] @@ -1884,9 +1814,9 @@ dependencies = [ [[package]] name = "gpu-descriptor" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" dependencies = [ "bitflags 2.5.0", "gpu-descriptor-types", @@ -1895,9 +1825,9 @@ dependencies = [ [[package]] name = "gpu-descriptor-types" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ "bitflags 2.5.0", ] @@ -1927,12 +1857,6 @@ dependencies = [ "winapi", ] -[[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" @@ -1993,19 +1917,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "image" -version = "0.24.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-traits", - "png", -] - [[package]] name = "image" version = "0.25.1" @@ -2217,9 +2128,6 @@ name = "lru" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" -dependencies = [ - "hashbrown", -] [[package]] name = "lyon" @@ -2288,15 +2196,6 @@ version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" -[[package]] -name = "memmap2" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" -dependencies = [ - "libc", -] - [[package]] name = "memmap2" version = "0.9.4" @@ -2326,9 +2225,9 @@ dependencies = [ [[package]] name = "metal" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +checksum = "5637e166ea14be6063a3f8ba5ccb9a4159df7d8f6d61c02fc3d480b1f90dcfcb" dependencies = [ "bitflags 2.5.0", "block", @@ -2367,10 +2266,11 @@ dependencies = [ [[package]] name = "naga" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843" +checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231" dependencies = [ + "arrayvec", "bit-set", "bitflags 2.5.0", "codespan-reporting", @@ -2396,7 +2296,7 @@ dependencies = [ "log", "ndk-sys", "num_enum", - "raw-window-handle 0.6.2", + "raw-window-handle", "thiserror", ] @@ -2484,7 +2384,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", - "objc_exception", ] [[package]] @@ -2639,15 +2538,6 @@ dependencies = [ "objc2-metal", ] -[[package]] -name = "objc_exception" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" -dependencies = [ - "cc", -] - [[package]] name = "objc_id" version = "0.1.1" @@ -2852,30 +2742,6 @@ dependencies = [ "toml_edit 0.21.1", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro2" version = "1.0.85" @@ -2939,24 +2805,12 @@ dependencies = [ "getrandom", ] -[[package]] -name = "range-alloc" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" - [[package]] name = "rangemap" version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" -[[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" @@ -3061,7 +2915,7 @@ dependencies = [ "objc-foundation", "objc_id", "pollster", - "raw-window-handle 0.6.2", + "raw-window-handle", "urlencoding", "wasm-bindgen", "wasm-bindgen-futures", @@ -3133,11 +2987,11 @@ dependencies = [ [[package]] name = "rustybuzz" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ee8fe2a8461a0854a37101fe7a1b13998d0cfa987e43248e81d2a5f4570f6fa" +checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "bytemuck", "libm", "smallvec", @@ -3297,7 +3151,7 @@ dependencies = [ "cursor-icon", "libc", "log", - "memmap2 0.9.4", + "memmap2", "rustix 0.38.34", "thiserror", "wayland-backend", @@ -3545,12 +3399,6 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" -[[package]] -name = "ttf-parser" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" - [[package]] name = "ttf-parser" version = "0.20.0" @@ -3938,36 +3786,38 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.15" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db67ae75a9405634f5882791678772c94ff5f16a66535aae186e26aa0841fc8b" +checksum = "425ba64c1e13b1c6e8c5d2541c8fac10022ca584f33da781db01b5756aef1f4e" dependencies = [ + "block2 0.5.1", "core-foundation", "home", "jni", "log", "ndk-context", - "objc", - "raw-window-handle 0.5.2", + "objc2 0.5.2", + "objc2-foundation", "url", "web-sys", ] [[package]] name = "wgpu" -version = "0.19.4" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbd7311dbd2abcfebaabf1841a2824ed7c8be443a0f29166e5d3c6a53a762c01" +checksum = "32ff1bfee408e1028e2e3acbf6d32d98b08a5a059ccbf5f33305534453ba5d3e" dependencies = [ "arrayvec", "cfg-if", "cfg_aliases", + "document-features", "js-sys", "log", "naga", "parking_lot", "profiling", - "raw-window-handle 0.6.2", + "raw-window-handle", "smallvec", "static_assertions", "wasm-bindgen", @@ -3980,22 +3830,23 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.19.4" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b94525fc99ba9e5c9a9e24764f2bc29bad0911a7446c12f446a8277369bf3a" +checksum = "ac6a86eaa5e763e59c73cf9e97d55fffd4dfda69fd8bda19589fcf851ddfef1f" dependencies = [ "arrayvec", "bit-vec", "bitflags 2.5.0", "cfg_aliases", "codespan-reporting", + "document-features", "indexmap", "log", "naga", "once_cell", "parking_lot", "profiling", - "raw-window-handle 0.6.2", + "raw-window-handle", "rustc-hash", "smallvec", "thiserror", @@ -4006,19 +3857,17 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.19.4" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1a4924366df7ab41a5d8546d6534f1f33231aa5b3f72b9930e300f254e39c3" +checksum = "4d71c8ae05170583049b65ee562fd839fdc0b3e9ddb84f4e40c9d5f8ea0d4c8c" dependencies = [ "android_system_properties", "arrayvec", "ash", - "bit-set", "bitflags 2.5.0", "block", "cfg_aliases", "core-graphics-types", - "d3d12", "glow", "glutin_wgl_sys", "gpu-alloc", @@ -4028,7 +3877,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.3", + "libloading 0.7.4", "log", "metal", "naga", @@ -4037,8 +3886,7 @@ dependencies = [ "once_cell", "parking_lot", "profiling", - "range-alloc", - "raw-window-handle 0.6.2", + "raw-window-handle", "renderdoc-sys", "rustc-hash", "smallvec", @@ -4051,9 +3899,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805" +checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef" dependencies = [ "bitflags 2.5.0", "js-sys", @@ -4374,14 +4222,14 @@ dependencies = [ "js-sys", "libc", "log", - "memmap2 0.9.4", + "memmap2", "ndk", "ndk-sys", "objc2 0.4.1", "once_cell", "orbclient", "percent-encoding", - "raw-window-handle 0.6.2", + "raw-window-handle", "redox_syscall 0.3.5", "rustix 0.38.34", "smithay-client-toolkit", diff --git a/ecadg/Cargo.toml b/ecadg/Cargo.toml index 86494e0..f4ff2ef 100644 --- a/ecadg/Cargo.toml +++ b/ecadg/Cargo.toml @@ -7,20 +7,28 @@ edition = "2021" [dependencies] altium = { path = "../altium", version = "0.2.1", features = ["_sealed"] } -egui = "0.27.2" -egui_dock = "0.12.0" -egui_extras = "0.27.2" -egui_plot = "0.27.2" +# FIXME: use wgpu 0.20 when available +# egui = "0.27.2" +# egui_extras = "0.27.2" +# egui_plot = "0.27.2" +egui = { git = "https://github.com/emilk/egui.git", branch = "emilk/wgpu-0.20"} +egui_extras = { git = "https://github.com/emilk/egui.git", branch = "emilk/wgpu-0.20"} +egui_plot = { git = "https://github.com/emilk/egui.git", branch = "emilk/wgpu-0.20"} log = "0.4.21" serde = "1.0.203" rfd = "0.14.1" regex = "1.10.4" bytemuck = "1.16.0" lyon = "1.0.1" -glyphon = "0.5.0" +# FIXME: don't use git once there is a new release, +# glyphon = "0.5.0" +glyphon = { git = "https://github.com/grovesNL/glyphon.git", ref = "2a457087674b0c124d37c85bc6769ba27dcde173"} [dependencies.eframe] -version = "0.27.2" +# version = "0.27.2" +git = "https://github.com/emilk/egui.git" +branch = "emilk/wgpu-0.20" +reg = "3dca4c667f30fe7199433d3607efbe15c76a1cb6" default-features = false features = [ "accesskit", # Make egui comptaible with screen readers. NOTE: adds a lot of dependencies. diff --git a/ecadg/src/gfx/grid.rs b/ecadg/src/gfx/grid.rs index ad170c0..bde51de 100644 --- a/ecadg/src/gfx/grid.rs +++ b/ecadg/src/gfx/grid.rs @@ -200,11 +200,13 @@ impl GridCtx { entry_point: "vs_main", // buffers: &[], buffers: &[GridInstanceBuf::desc()], + compilation_options: wgpu::PipelineCompilationOptions::default(), }, fragment: Some(wgpu::FragmentState { module: &shader, entry_point: "fs_main", targets: &[Some(render_state.target_format.into())], + compilation_options: wgpu::PipelineCompilationOptions::default(), }), primitive: wgpu::PrimitiveState { topology: wgpu::PrimitiveTopology::LineList, diff --git a/ecadg/src/gfx/origin.rs b/ecadg/src/gfx/origin.rs index 5574f51..86e0c32 100644 --- a/ecadg/src/gfx/origin.rs +++ b/ecadg/src/gfx/origin.rs @@ -102,11 +102,13 @@ impl OriginCtx { module: &shader, entry_point: "vs_main", buffers: &[], + compilation_options: wgpu::PipelineCompilationOptions::default(), }, fragment: Some(wgpu::FragmentState { module: &shader, entry_point: "fs_main", targets: &[Some(render_state.target_format.into())], + compilation_options: wgpu::PipelineCompilationOptions::default(), }), primitive: wgpu::PrimitiveState::default(), depth_stencil: None, diff --git a/ecadg/src/gfx/tessellated.rs b/ecadg/src/gfx/tessellated.rs index f79a347..9ea9606 100644 --- a/ecadg/src/gfx/tessellated.rs +++ b/ecadg/src/gfx/tessellated.rs @@ -262,6 +262,7 @@ impl TessCtx { entry_point: "vs_main", buffers: &[TessVertex::desc()], // buffers: &[TessVertex::desc(), TessVertex::desc()], + compilation_options: wgpu::PipelineCompilationOptions::default(), }, fragment: Some(wgpu::FragmentState { module: &shader, @@ -272,6 +273,7 @@ impl TessCtx { // write_mask: wgpu::ColorWrites::ALL, // })], targets: &[Some(render_state.target_format.into())], + compilation_options: wgpu::PipelineCompilationOptions::default(), }), primitive: wgpu::PrimitiveState { // topology: wgpu::PrimitiveTopology::LineList, diff --git a/ecadg/src/gfx/triangle.rs b/ecadg/src/gfx/triangle.rs index 9f3b731..d99be54 100644 --- a/ecadg/src/gfx/triangle.rs +++ b/ecadg/src/gfx/triangle.rs @@ -60,11 +60,13 @@ impl TriangleCtx { module: &shader, entry_point: "vs_main", buffers: &[], + compilation_options: wgpu::PipelineCompilationOptions::default(), }, fragment: Some(wgpu::FragmentState { module: &shader, entry_point: "fs_main", targets: &[Some(render_state.target_format.into())], + compilation_options: wgpu::PipelineCompilationOptions::default(), }), primitive: wgpu::PrimitiveState::default(), depth_stencil: None,