diff --git a/Cargo.lock b/Cargo.lock index 65241a3ba40d..1ff29cf67639 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -378,7 +378,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -413,7 +413,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -466,23 +466,23 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.85", + "syn", ] [[package]] name = "bit-set" -version = "0.6.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" +checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" dependencies = [ "bit-vec", ] [[package]] name = "bit-vec" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" +checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] name = "bitflags" @@ -585,7 +585,7 @@ checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -796,7 +796,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -836,37 +836,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" -[[package]] -name = "com" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" -dependencies = [ - "com_macros", -] - -[[package]] -name = "com_macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" -dependencies = [ - "com_macros_support", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "com_macros_support" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "combine" version = "4.6.7" @@ -1152,17 +1121,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" -[[package]] -name = "d3d12" -version = "22.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdbd1f579714e3c809ebd822c81ef148b1ceaeb3d535352afc73fd0c4c6a0017" -dependencies = [ - "bitflags 2.6.0", - "libloading", - "winapi", -] - [[package]] name = "darling" version = "0.20.10" @@ -1183,7 +1141,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -1194,7 +1152,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -1333,7 +1291,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -1387,7 +1345,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -1423,8 +1381,7 @@ checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" [[package]] name = "ecolor" version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775cfde491852059e386c4e1deb4aef381c617dc364184c6f6afee99b87c402b" +source = "git+https://github.com/emilk/egui.git?branch=master#67c82ed5f2711b574af16d78977276b2ec0077f7" dependencies = [ "bytemuck", "emath", @@ -1433,8 +1390,7 @@ dependencies = [ [[package]] name = "egui" version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53eafabcce0cb2325a59a98736efe0bf060585b437763f8c476957fb274bb974" +source = "git+https://github.com/emilk/egui.git?branch=master#67c82ed5f2711b574af16d78977276b2ec0077f7" dependencies = [ "ahash", "emath", @@ -1446,8 +1402,7 @@ dependencies = [ [[package]] name = "egui-wgpu" version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00fd5d06d8405397e64a928fa0ef3934b3c30273ea7603e3dc4627b1f7a1a82" +source = "git+https://github.com/emilk/egui.git?branch=master#67c82ed5f2711b574af16d78977276b2ec0077f7" dependencies = [ "ahash", "bytemuck", @@ -1465,8 +1420,7 @@ dependencies = [ [[package]] name = "egui-winit" version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a9c430f4f816340e8e8c1b20eec274186b1be6bc4c7dfc467ed50d57abc36c6" +source = "git+https://github.com/emilk/egui.git?branch=master#67c82ed5f2711b574af16d78977276b2ec0077f7" dependencies = [ "ahash", "arboard", @@ -1482,8 +1436,7 @@ dependencies = [ [[package]] name = "egui_extras" version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf3c1f5cd8dfe2ade470a218696c66cf556fcfd701e7830fa2e9f4428292a2a1" +source = "git+https://github.com/emilk/egui.git?branch=master#67c82ed5f2711b574af16d78977276b2ec0077f7" dependencies = [ "ahash", "egui", @@ -1501,8 +1454,7 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "emath" version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1fe0049ce51d0fb414d029e668dd72eb30bc2b739bf34296ed97bd33df544f3" +source = "git+https://github.com/emilk/egui.git?branch=master#67c82ed5f2711b574af16d78977276b2ec0077f7" dependencies = [ "bytemuck", ] @@ -1560,7 +1512,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -1581,7 +1533,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -1602,7 +1554,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -1631,8 +1583,7 @@ dependencies = [ [[package]] name = "epaint" version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a32af8da821bd4f43f2c137e295459ee2e1661d87ca8779dfa0eaf45d870e20f" +source = "git+https://github.com/emilk/egui.git?branch=master#67c82ed5f2711b574af16d78977276b2ec0077f7" dependencies = [ "ab_glyph", "ahash", @@ -1648,8 +1599,7 @@ dependencies = [ [[package]] name = "epaint_default_fonts" version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "483440db0b7993cf77a20314f08311dbe95675092405518c0677aa08c151a3ea" +source = "git+https://github.com/emilk/egui.git?branch=master#67c82ed5f2711b574af16d78977276b2ec0077f7" [[package]] name = "equivalent" @@ -1831,7 +1781,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.85", + "syn", "unic-langid", ] @@ -1924,7 +1874,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -2011,7 +1961,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -2063,7 +2013,7 @@ checksum = "c612a69f5557a11046b77a7408d2836fe77077f842171cd211c5ef504bd3cddd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", "synstructure", ] @@ -2155,7 +2105,7 @@ dependencies = [ "vec_map", "wasm-bindgen", "web-sys", - "windows 0.54.0", + "windows 0.58.0", ] [[package]] @@ -2226,9 +2176,9 @@ dependencies = [ [[package]] name = "glow" -version = "0.13.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" +checksum = "d51fa363f025f5c111e03f13eda21162faeacb6911fe8caa0c0349f9cf0c4483" dependencies = [ "js-sys", "slotmap", @@ -2266,15 +2216,14 @@ dependencies = [ [[package]] name = "gpu-allocator" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7" +checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd" dependencies = [ "log", "presser", "thiserror", - "winapi", - "windows 0.52.0", + "windows 0.58.0", ] [[package]] @@ -2366,21 +2315,6 @@ dependencies = [ "foldhash", ] -[[package]] -name = "hassle-rs" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" -dependencies = [ - "bitflags 2.6.0", - "com", - "libc", - "libloading", - "thiserror", - "widestring", - "winapi", -] - [[package]] name = "heck" version = "0.5.0" @@ -2884,7 +2818,7 @@ checksum = "b01f197a15988fb5b2ec0a5a9800c97e70771499c456ad757d63b3c5e9b96e75" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -3134,9 +3068,9 @@ dependencies = [ [[package]] name = "naga" -version = "22.1.0" +version = "23.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" +checksum = "3d5941e45a15b53aad4375eedf02033adb7a28931eedc31117faffa52e6a857e" dependencies = [ "arrayvec", "bit-set", @@ -3330,7 +3264,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -3370,7 +3304,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -3634,9 +3568,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "option-ext" @@ -3752,7 +3686,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -3862,7 +3796,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.85", + "syn", ] [[package]] @@ -3915,7 +3849,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -4425,7 +4359,7 @@ name = "ruffle_macros" version = "0.1.0" dependencies = [ "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -4874,7 +4808,7 @@ checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -4898,7 +4832,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -5200,17 +5134,6 @@ dependencies = [ "symphonia-core", ] -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - [[package]] name = "syn" version = "2.0.85" @@ -5239,7 +5162,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -5329,7 +5252,7 @@ checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -5459,7 +5382,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -5558,7 +5481,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -5754,7 +5677,7 @@ checksum = "1ed7f4237ba393424195053097c1516bd4590dc82b84f2f97c5c69e12704555b" dependencies = [ "proc-macro-hack", "quote", - "syn 2.0.85", + "syn", "unic-langid-impl", ] @@ -5970,7 +5893,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.85", + "syn", "wasm-bindgen-shared", ] @@ -6004,7 +5927,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6198,9 +6121,9 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" -version = "22.1.0" +version = "23.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" +checksum = "76ab52f2d3d18b70d5ab8dd270a1cff3ebe6dbe4a7d13c1cc2557138a9777fdc" dependencies = [ "arrayvec", "cfg_aliases 0.1.1", @@ -6223,9 +6146,9 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "22.1.0" +version = "23.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" +checksum = "0e0c68e7b6322a03ee5b83fcd92caeac5c2a932f6457818179f4652ad2a9c065" dependencies = [ "arrayvec", "bit-vec", @@ -6248,9 +6171,9 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "22.0.0" +version = "23.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" +checksum = "de6e7266b869de56c7e3ed72a954899f71d14fec6cc81c102b7530b92947601b" dependencies = [ "android_system_properties", "arrayvec", @@ -6258,15 +6181,14 @@ dependencies = [ "bit-set", "bitflags 2.6.0", "block", + "bytemuck", "cfg_aliases 0.1.1", "core-graphics-types", - "d3d12", "glow", "glutin_wgl_sys", "gpu-alloc", "gpu-allocator", "gpu-descriptor", - "hassle-rs", "js-sys", "khronos-egl", "libc", @@ -6288,14 +6210,15 @@ dependencies = [ "wasm-bindgen", "web-sys", "wgpu-types", - "winapi", + "windows 0.58.0", + "windows-core 0.58.0", ] [[package]] name = "wgpu-types" -version = "22.0.0" +version = "23.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d" +checksum = "610f6ff27778148c31093f3b03abc4840f9636d58d597ca2f5977433acfe0068" dependencies = [ "bitflags 2.6.0", "js-sys", @@ -6312,12 +6235,6 @@ dependencies = [ "safe_arch", ] -[[package]] -name = "widestring" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" - [[package]] name = "winapi" version = "0.3.9" @@ -6351,21 +6268,21 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.52.0" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" dependencies = [ - "windows-core 0.52.0", + "windows-core 0.54.0", "windows-targets 0.52.6", ] [[package]] name = "windows" -version = "0.54.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" dependencies = [ - "windows-core 0.54.0", + "windows-core 0.58.0", "windows-targets 0.52.6", ] @@ -6388,6 +6305,41 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result 0.2.0", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "windows-registry" version = "0.2.0" @@ -6847,7 +6799,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.85", + "syn", "zvariant_utils", ] @@ -6880,7 +6832,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] [[package]] @@ -6943,7 +6895,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.85", + "syn", "zvariant_utils", ] @@ -6955,5 +6907,5 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn", ] diff --git a/Cargo.toml b/Cargo.toml index 9f35e65349ed..f41cac297ac4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,9 +48,9 @@ version = "0.1.0" [workspace.dependencies] tracing = "0.1.40" tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } -naga = { version = "22.1.0", features = ["wgsl-out"] } -wgpu = "22.1.0" -egui = "0.29.1" +naga = { version = "23.0.0", features = ["wgsl-out"] } +wgpu = "23.0.0" +egui = { git = "https://github.com/emilk/egui.git", branch = "master" } clap = { version = "4.5.20", features = ["derive"] } cpal = "0.15.3" anyhow = "1.0" diff --git a/core/Cargo.toml b/core/Cargo.toml index b4b7ae9d7be3..f2aaa83c9032 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -55,7 +55,7 @@ hashbrown = { version = "0.14.5", features = ["raw"] } scopeguard = "1.2.0" fluent-templates = "0.11.0" egui = { workspace = true, optional = true } -egui_extras = { version = "0.29.1", default-features = false, optional = true } +egui_extras = { git = "https://github.com/emilk/egui.git", branch = "master", default-features = false, optional = true } png = { version = "0.17.14", optional = true } flv-rs = { path = "../flv" } async-channel = { workspace = true } diff --git a/deny.toml b/deny.toml index 4f2349eddcfe..e60e42885ccf 100644 --- a/deny.toml +++ b/deny.toml @@ -77,6 +77,9 @@ unknown-git = "deny" # github.com organizations to allow git sources for github = [ "ruffle-rs", + # TODO: Remove once a release with https://github.com/emilk/egui/pull/5330 + # (the wgpu bump to 23.0.0) in it is out. + "emilk", ] [advisories] diff --git a/desktop/Cargo.toml b/desktop/Cargo.toml index e1c466b49742..7c4c27bc36aa 100644 --- a/desktop/Cargo.toml +++ b/desktop/Cargo.toml @@ -14,10 +14,10 @@ workspace = true clap = { workspace = true } cpal = { workspace = true } egui = { workspace = true } -egui_extras = { version = "0.29.1", default-features = false, features = ["image"] } -egui-wgpu = { version = "0.29.1", features = ["winit"] } +egui_extras = { git = "https://github.com/emilk/egui.git", branch = "master", default-features = false, features = ["image"] } +egui-wgpu = { git = "https://github.com/emilk/egui.git", branch = "master", features = ["winit"] } image = { workspace = true, features = ["png"] } -egui-winit = "0.29.1" +egui-winit = { git = "https://github.com/emilk/egui.git", branch = "master" } fontdb = "0.23" ruffle_core = { path = "../core", features = ["audio", "clap", "mp3", "nellymoser", "default_compatibility_rules", "egui"] } ruffle_render = { path = "../render", features = ["clap"] } diff --git a/desktop/src/gui/movie.rs b/desktop/src/gui/movie.rs index 474761617c42..e80af83263ee 100644 --- a/desktop/src/gui/movie.rs +++ b/desktop/src/gui/movie.rs @@ -78,7 +78,7 @@ impl MovieViewRenderer { label: None, layout: Some(&pipeline_layout), vertex: wgpu::VertexState { - entry_point: "vs_main", + entry_point: Some("vs_main"), module: &module, buffers: &[wgpu::VertexBufferLayout { array_stride: 4 * 4, @@ -107,11 +107,11 @@ impl MovieViewRenderer { fragment: Some(wgpu::FragmentState { module: &module, - entry_point: if surface_format.is_srgb() { + entry_point: Some(if surface_format.is_srgb() { "fs_main_srgb_framebuffer" } else { "fs_main_linear_framebuffer" - }, + }), targets: &[Some(wgpu::ColorTargetState { format: surface_format, blend: Some(wgpu::BlendState::REPLACE), diff --git a/desktop/src/util.rs b/desktop/src/util.rs index 757e4fcf0810..a0f8fc0f4e4f 100644 --- a/desktop/src/util.rs +++ b/desktop/src/util.rs @@ -254,27 +254,10 @@ pub fn plot_stats_in_tracy(instance: &wgpu::Instance) { .generate_report() .expect("reports should be available on desktop"); - #[allow(unused_mut)] - let mut backend = None; - #[cfg(not(any(target_os = "macos", target_os = "ios")))] - { - backend = backend.or(report.vulkan).or(report.gl); - } - #[cfg(windows)] - { - backend = backend.or(report.dx12); - } - #[cfg(any(target_os = "macos", target_os = "ios"))] - { - backend = backend.or(report.metal); - } - - if let Some(stats) = backend { - tracy.plot(BIND_GROUPS, stats.bind_groups.num_allocated as f64); - tracy.plot(BUFFERS, stats.buffers.num_allocated as f64); - tracy.plot(TEXTURES, stats.textures.num_allocated as f64); - tracy.plot(TEXTURE_VIEWS, stats.texture_views.num_allocated as f64); - } + tracy.plot(BIND_GROUPS, report.hub.bind_groups.num_allocated as f64); + tracy.plot(BUFFERS, report.hub.buffers.num_allocated as f64); + tracy.plot(TEXTURES, report.hub.textures.num_allocated as f64); + tracy.plot(TEXTURE_VIEWS, report.hub.texture_views.num_allocated as f64); tracy.frame_mark(); } diff --git a/render/wgpu/src/context3d/current_pipeline.rs b/render/wgpu/src/context3d/current_pipeline.rs index b70ba889f14a..eae45efc7112 100644 --- a/render/wgpu/src/context3d/current_pipeline.rs +++ b/render/wgpu/src/context3d/current_pipeline.rs @@ -490,13 +490,13 @@ impl CurrentPipeline { layout: Some(&pipeline_layout), vertex: VertexState { module: &compiled_shaders.vertex_module, - entry_point: naga_agal::SHADER_ENTRY_POINT, + entry_point: Some(naga_agal::SHADER_ENTRY_POINT), buffers: &wgpu_vertex_buffers, compilation_options: Default::default(), }, fragment: Some(wgpu::FragmentState { module: &compiled_shaders.fragment_module, - entry_point: naga_agal::SHADER_ENTRY_POINT, + entry_point: Some(naga_agal::SHADER_ENTRY_POINT), targets: &[Some(ColorTargetState { format: self.target_format, blend: Some(wgpu::BlendState { diff --git a/render/wgpu/src/descriptors.rs b/render/wgpu/src/descriptors.rs index 9d819846a7cc..bfcd00eae036 100644 --- a/render/wgpu/src/descriptors.rs +++ b/render/wgpu/src/descriptors.rs @@ -98,13 +98,13 @@ impl Descriptors { layout: Some(copy_texture_pipeline_layout), vertex: wgpu::VertexState { module: &self.shaders.copy_srgb_shader, - entry_point: "main_vertex", + entry_point: Some("main_vertex"), buffers: &VERTEX_BUFFERS_DESCRIPTION_POS, compilation_options: Default::default(), }, fragment: Some(wgpu::FragmentState { module: &self.shaders.copy_srgb_shader, - entry_point: "main_fragment", + entry_point: Some("main_fragment"), targets: &[Some(wgpu::ColorTargetState { format, // All of our blending has been done by now, so we want @@ -168,13 +168,13 @@ impl Descriptors { layout: Some(copy_texture_pipeline_layout), vertex: wgpu::VertexState { module: &self.shaders.copy_shader, - entry_point: "main_vertex", + entry_point: Some("main_vertex"), buffers: &VERTEX_BUFFERS_DESCRIPTION_POS, compilation_options: Default::default(), }, fragment: Some(wgpu::FragmentState { module: &self.shaders.copy_shader, - entry_point: "main_fragment", + entry_point: Some("main_fragment"), targets: &[Some(wgpu::ColorTargetState { format, // All of our blending has been done by now, so we want diff --git a/render/wgpu/src/filters/bevel.rs b/render/wgpu/src/filters/bevel.rs index 168d565dba31..4bd4da75d931 100644 --- a/render/wgpu/src/filters/bevel.rs +++ b/render/wgpu/src/filters/bevel.rs @@ -120,7 +120,7 @@ impl BevelFilter { layout: Some(&self.pipeline_layout), vertex: wgpu::VertexState { module: &descriptors.shaders.bevel_filter, - entry_point: "main_vertex", + entry_point: Some("main_vertex"), buffers: &VERTEX_BUFFERS_DESCRIPTION_FILTERS_WITH_DOUBLE_BLUR, compilation_options: Default::default(), }, @@ -141,7 +141,7 @@ impl BevelFilter { }, fragment: Some(wgpu::FragmentState { module: &descriptors.shaders.bevel_filter, - entry_point: "main_fragment", + entry_point: Some("main_fragment"), targets: &[Some(wgpu::TextureFormat::Rgba8Unorm.into())], compilation_options: Default::default(), }), diff --git a/render/wgpu/src/filters/blur.rs b/render/wgpu/src/filters/blur.rs index 505d149ccfee..7beda3137e1f 100644 --- a/render/wgpu/src/filters/blur.rs +++ b/render/wgpu/src/filters/blur.rs @@ -115,7 +115,7 @@ impl BlurFilter { layout: Some(&self.pipeline_layout), vertex: wgpu::VertexState { module: &descriptors.shaders.blur_filter, - entry_point: "main_vertex", + entry_point: Some("main_vertex"), buffers: &VERTEX_BUFFERS_DESCRIPTION_FILTERS, compilation_options: Default::default(), }, @@ -136,7 +136,7 @@ impl BlurFilter { }, fragment: Some(wgpu::FragmentState { module: &descriptors.shaders.blur_filter, - entry_point: "main_fragment", + entry_point: Some("main_fragment"), targets: &[Some(wgpu::TextureFormat::Rgba8Unorm.into())], compilation_options: Default::default(), }), diff --git a/render/wgpu/src/filters/color_matrix.rs b/render/wgpu/src/filters/color_matrix.rs index e22f7d817a78..0384a382d2d6 100644 --- a/render/wgpu/src/filters/color_matrix.rs +++ b/render/wgpu/src/filters/color_matrix.rs @@ -96,7 +96,7 @@ impl ColorMatrixFilter { layout: Some(&self.pipeline_layout), vertex: wgpu::VertexState { module: &descriptors.shaders.color_matrix_filter, - entry_point: "main_vertex", + entry_point: Some("main_vertex"), buffers: &VERTEX_BUFFERS_DESCRIPTION_FILTERS, compilation_options: Default::default(), }, @@ -117,7 +117,7 @@ impl ColorMatrixFilter { }, fragment: Some(wgpu::FragmentState { module: &descriptors.shaders.color_matrix_filter, - entry_point: "main_fragment", + entry_point: Some("main_fragment"), targets: &[Some(wgpu::TextureFormat::Rgba8Unorm.into())], compilation_options: Default::default(), }), diff --git a/render/wgpu/src/filters/displacement_map.rs b/render/wgpu/src/filters/displacement_map.rs index 529e26e6d9b9..9bdb7b73744f 100644 --- a/render/wgpu/src/filters/displacement_map.rs +++ b/render/wgpu/src/filters/displacement_map.rs @@ -133,7 +133,7 @@ impl DisplacementMapFilter { layout: Some(&self.pipeline_layout), vertex: wgpu::VertexState { module: &descriptors.shaders.displacement_map_filter, - entry_point: "main_vertex", + entry_point: Some("main_vertex"), buffers: &VERTEX_BUFFERS_DESCRIPTION_FILTERS, compilation_options: Default::default(), }, @@ -154,7 +154,7 @@ impl DisplacementMapFilter { }, fragment: Some(wgpu::FragmentState { module: &descriptors.shaders.displacement_map_filter, - entry_point: "main_fragment", + entry_point: Some("main_fragment"), targets: &[Some(wgpu::TextureFormat::Rgba8Unorm.into())], compilation_options: Default::default(), }), diff --git a/render/wgpu/src/filters/glow.rs b/render/wgpu/src/filters/glow.rs index 28c0616698ff..f16a45830c1f 100644 --- a/render/wgpu/src/filters/glow.rs +++ b/render/wgpu/src/filters/glow.rs @@ -119,7 +119,7 @@ impl GlowFilter { layout: Some(&self.pipeline_layout), vertex: wgpu::VertexState { module: &descriptors.shaders.glow_filter, - entry_point: "main_vertex", + entry_point: Some("main_vertex"), buffers: &VERTEX_BUFFERS_DESCRIPTION_FILTERS_WITH_BLUR, compilation_options: Default::default(), }, @@ -140,7 +140,7 @@ impl GlowFilter { }, fragment: Some(wgpu::FragmentState { module: &descriptors.shaders.glow_filter, - entry_point: "main_fragment", + entry_point: Some("main_fragment"), targets: &[Some(wgpu::TextureFormat::Rgba8Unorm.into())], compilation_options: Default::default(), }), diff --git a/render/wgpu/src/pipelines.rs b/render/wgpu/src/pipelines.rs index 030aebe7aace..b058be3b04a2 100644 --- a/render/wgpu/src/pipelines.rs +++ b/render/wgpu/src/pipelines.rs @@ -267,13 +267,13 @@ fn create_pipeline_descriptor<'a>( layout: Some(pipeline_layout), vertex: wgpu::VertexState { module: vertex_shader, - entry_point: "main_vertex", + entry_point: Some("main_vertex"), buffers: vertex_buffer_layout, compilation_options: Default::default(), }, fragment: Some(wgpu::FragmentState { module: fragment_shader, - entry_point: "main_fragment", + entry_point: Some("main_fragment"), targets: color_target_state, compilation_options: wgpu::PipelineCompilationOptions { constants: fragment_constants, diff --git a/render/wgpu/src/pixel_bender.rs b/render/wgpu/src/pixel_bender.rs index 7ce390333a06..ae744d7f507b 100644 --- a/render/wgpu/src/pixel_bender.rs +++ b/render/wgpu/src/pixel_bender.rs @@ -63,13 +63,13 @@ impl PixelBenderWgpuShader { layout: Some(&self.pipeline_layout), vertex: VertexState { module: &self.vertex_shader, - entry_point: naga_pixelbender::VERTEX_SHADER_ENTRYPOINT, + entry_point: Some(naga_pixelbender::VERTEX_SHADER_ENTRYPOINT), buffers: &VERTEX_BUFFERS_DESCRIPTION_FILTERS, compilation_options: Default::default(), }, fragment: Some(wgpu::FragmentState { module: &self.fragment_shader, - entry_point: naga_pixelbender::FRAGMENT_SHADER_ENTRYPOINT, + entry_point: Some(naga_pixelbender::FRAGMENT_SHADER_ENTRYPOINT), targets: &[Some(ColorTargetState { format, // FIXME - what should this be?