Skip to content

armgit / gecko

Public Imported from GitHub
0

A GameCube/Wii emulator and debugger written in Rust.

upgrade wgpu, polish main app, start actual games, fix web build

Layle14da40f2fe73
diff --git a/Cargo.lock b/Cargo.lock
index a965ce0..200ee12 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20,9 +20,12 @@ checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618"
[[package]]
name = "accesskit"
-version = "0.21.1"
+version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf203f9d3bd8f29f98833d1fbef628df18f759248a547e7e01cfbf63cda36a99"
+checksum = "5351dcebb14b579ccab05f288596b2ae097005be7ee50a7c3d4ca9d0d5a66f6a"
+dependencies = [
+ "uuid",
+]
[[package]]
name = "addr2line"
@@ -92,7 +95,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "812947049edcd670a82cd5c73c3661d2e58468577ba8489de58e1a73c04cbd5d"
dependencies = [
"alsa-sys",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"cfg-if",
"libc",
]
@@ -114,7 +117,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f2a1bb052857d5dd49572219344a7332b31b76405648eabac5bc68978251bcd"
dependencies = [
"android-properties",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"cc",
"jni 0.22.4",
"libc",
@@ -239,9 +242,19 @@ dependencies = [
"parking_lot",
"percent-encoding",
"windows-sys 0.60.2",
+ "wl-clipboard-rs",
"x11rb",
]
+[[package]]
+name = "arc-swap"
+version = "1.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a3a1fd6f75306b68087b831f025c712524bcb19aad54e557b1129cfa0a2b207"
+dependencies = [
+ "rustversion",
+]
+
[[package]]
name = "arg_enum_proc_macro"
version = "0.3.4"
@@ -527,7 +540,7 @@ dependencies = [
"rustc-hash 2.1.2",
"tracing",
"wesl",
- "wgpu 28.0.0",
+ "wgpu",
]
[[package]]
@@ -576,7 +589,16 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
dependencies = [
- "bit-vec",
+ "bit-vec 0.8.0",
+]
+
+[[package]]
+name = "bit-set"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34ddef2995421ab6a5c779542c81ee77c115206f4ad9d5a8e05f4ff49716a3dd"
+dependencies = [
+ "bit-vec 0.9.1",
]
[[package]]
@@ -585,6 +607,12 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+[[package]]
+name = "bit-vec"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b71798fca2c1fe1086445a7258a4bc81e6e49dcd24c8d0dd9a1e57395b603f51"
+
[[package]]
name = "bit_field"
version = "0.10.3"
@@ -599,9 +627,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.11.0"
+version = "2.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
+checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
dependencies = [
"serde_core",
]
@@ -615,12 +643,6 @@ dependencies = [
"no_std_io2",
]
-[[package]]
-name = "block"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-
[[package]]
name = "block-buffer"
version = "0.10.4"
@@ -730,7 +752,7 @@ version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"log",
"polling",
"rustix 0.38.44",
@@ -744,7 +766,7 @@ version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4dbf9978365bac10f54d1d4b04f7ce4427e51f71d61f2fe15e3fed5166474df7"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"polling",
"rustix 1.1.4",
"slab",
@@ -792,9 +814,9 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.2.57"
+version = "1.2.62"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a0dd1ca384932ff3641c8718a02769f1698e7563dc6974ffd03346116310423"
+checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98"
dependencies = [
"find-msvc-tools",
"jobserver",
@@ -862,10 +884,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
dependencies = [
"iana-time-zone",
- "js-sys",
"num-traits",
"serde",
- "wasm-bindgen",
"windows-link",
]
@@ -924,36 +944,6 @@ dependencies = [
"error-code",
]
-[[package]]
-name = "clipboard_macos"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7f4aaa047ba3c3630b080bb9860894732ff23e2aee290a418909aa6d5df38f"
-dependencies = [
- "objc2 0.5.2",
- "objc2-app-kit 0.2.2",
- "objc2-foundation 0.2.2",
-]
-
-[[package]]
-name = "clipboard_wayland"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "003f886bc4e2987729d10c1db3424e7f80809f3fc22dbc16c685738887cb37b8"
-dependencies = [
- "smithay-clipboard",
-]
-
-[[package]]
-name = "clipboard_x11"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd63e33452ffdafd39924c4f05a5dd1e94db646c779c6bd59148a3d95fff5ad4"
-dependencies = [
- "thiserror 2.0.18",
- "x11rb",
-]
-
[[package]]
name = "cmake"
version = "0.1.58"
@@ -965,9 +955,9 @@ dependencies = [
[[package]]
name = "codespan-reporting"
-version = "0.12.0"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81"
+checksum = "af491d569909a7e4dee0ad7db7f5341fef5c614d5b8ec8cf765732aba3cff681"
dependencies = [
"serde",
"termcolor",
@@ -976,9 +966,9 @@ dependencies = [
[[package]]
name = "color"
-version = "0.3.2"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a18ef4657441fb193b65f34dc39b3781f0dfec23d3bd94d0eeb4e88cde421edb"
+checksum = "2ec7c5eb7a16992b1904d76c517d170ab353b0e0b3d5a0c81a8a0cd1037893cf"
dependencies = [
"bytemuck",
]
@@ -1091,7 +1081,7 @@ checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
dependencies = [
"bitflags 1.3.2",
"core-foundation 0.9.4",
- "core-graphics-types 0.1.3",
+ "core-graphics-types",
"foreign-types",
"libc",
]
@@ -1107,17 +1097,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "core-graphics-types"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
-dependencies = [
- "bitflags 2.11.0",
- "core-foundation 0.10.1",
- "libc",
-]
-
[[package]]
name = "core_maths"
version = "0.1.1"
@@ -1133,7 +1112,7 @@ version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d5d7dca3ebcf65a035582c9ad4385371a9d9ee6537474d2a278f4e1e475bb58"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"libc",
"objc2-audio-toolbox",
"objc2-core-audio",
@@ -1143,20 +1122,20 @@ dependencies = [
[[package]]
name = "cosmic-text"
-version = "0.15.0"
+version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "173852283a9a57a3cbe365d86e74dc428a09c50421477d5ad6fe9d9509e37737"
+checksum = "be17b688510d934ce13f48a2beba700e11583e281e0fda99c22bb256a14eda73"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"fontdb",
"harfrust",
"linebender_resource_handle",
"log",
"rangemap",
- "rustc-hash 1.1.0",
+ "rustc-hash 2.1.2",
"self_cell",
- "skrifa 0.37.0",
- "smol_str",
+ "skrifa",
+ "smol_str 0.3.6",
"swash",
"sys-locale",
"unicode-bidi",
@@ -1192,7 +1171,7 @@ dependencies = [
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
- "windows 0.62.2",
+ "windows",
]
[[package]]
@@ -1421,7 +1400,7 @@ version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"crossterm_winapi",
"mio",
"parking_lot",
@@ -1437,7 +1416,7 @@ version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"crossterm_winapi",
"derive_more",
"document-features",
@@ -1467,14 +1446,13 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
[[package]]
name = "cryoglyph"
version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08bc795bdbccdbd461736fb163930a009da6597b226d6f6fce33e7a8eb6ec519"
+source = "git+https://github.com/iced-rs/cryoglyph.git?rev=53ba3e879539d19ed8162942126a977ec896cc3b#53ba3e879539d19ed8162942126a977ec896cc3b"
dependencies = [
"cosmic-text",
"etagere",
"lru 0.16.4",
"rustc-hash 2.1.2",
- "wgpu 27.0.1",
+ "wgpu",
]
[[package]]
@@ -1582,8 +1560,8 @@ dependencies = [
"pollster",
"scripting",
"tracing-subscriber",
- "wgpu 28.0.0",
- "winit",
+ "wgpu",
+ "winit 0.30.13",
]
[[package]]
@@ -1659,7 +1637,7 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.6.2",
"libc",
"objc2 0.6.4",
@@ -1700,6 +1678,11 @@ version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
+[[package]]
+name = "dpi"
+version = "0.1.1"
+source = "git+https://github.com/iced-rs/winit.git?rev=05b8ff17a06562f0a10bb46e6eaacbe2a95cb5ed#05b8ff17a06562f0a10bb46e6eaacbe2a95cb5ed"
+
[[package]]
name = "dpi"
version = "0.1.2"
@@ -1745,8 +1728,9 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
[[package]]
name = "ecolor"
-version = "0.33.3"
-source = "git+https://github.com/ioncodes/egui.git#5aeebf13a9d68f49766273104fbde0a5ab6e38fc"
+version = "0.34.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55f6cc0cb3b84a21232c468db972ebcddd34decbf1ff02cdebffd807c13bbd81"
dependencies = [
"bytemuck",
"emath",
@@ -1754,12 +1738,13 @@ dependencies = [
[[package]]
name = "egui"
-version = "0.33.3"
-source = "git+https://github.com/ioncodes/egui.git#5aeebf13a9d68f49766273104fbde0a5ab6e38fc"
+version = "0.34.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cbe28ac1a9c0761319aafb9ad37737720cc49d99c13a4a6b990768fa01ffe67"
dependencies = [
"accesskit",
"ahash",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"emath",
"epaint",
"log",
@@ -1771,17 +1756,18 @@ dependencies = [
[[package]]
name = "egui-phosphor"
-version = "0.11.0"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b2838620355debaeb7fa3cc331a1d8ab77e6387d40e65686fa468c229dbf63"
+checksum = "cb4e4b18e368ff336c8dd2102992e2631b118f29a2164b0d2be9d8889dcd367e"
dependencies = [
"egui",
]
[[package]]
name = "egui-wgpu"
-version = "0.33.3"
-source = "git+https://github.com/ioncodes/egui.git#5aeebf13a9d68f49766273104fbde0a5ab6e38fc"
+version = "0.34.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f311c0b9cdd8a38821ae6f245fbe6e1a3d7d157c77b7d22344f205b317232c8"
dependencies = [
"ahash",
"bytemuck",
@@ -1792,27 +1778,28 @@ dependencies = [
"thiserror 2.0.18",
"type-map",
"web-time",
- "wgpu 28.0.0",
+ "wgpu",
]
[[package]]
name = "egui-winit"
-version = "0.33.3"
-source = "git+https://github.com/ioncodes/egui.git#5aeebf13a9d68f49766273104fbde0a5ab6e38fc"
+version = "0.34.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8e97625c2fe0fadc8b92ec690fbf515e15e2efd67ca50e063ad3302ec8ee626"
dependencies = [
"arboard",
"bytemuck",
"egui",
"log",
- "objc2 0.5.2",
- "objc2-foundation 0.2.2",
- "objc2-ui-kit",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+ "objc2-ui-kit 0.3.2",
"profiling",
"raw-window-handle",
"smithay-clipboard",
"web-time",
"webbrowser",
- "winit",
+ "winit 0.30.13",
]
[[package]]
@@ -1823,8 +1810,9 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
[[package]]
name = "emath"
-version = "0.33.3"
-source = "git+https://github.com/ioncodes/egui.git#5aeebf13a9d68f49766273104fbde0a5ab6e38fc"
+version = "0.34.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a74fbbf7501c430b89df62d102b6bfa02162faaf3e155512c677c9d20f5708d1"
dependencies = [
"bytemuck",
]
@@ -1879,29 +1867,31 @@ checksum = "c7f84e12ccf0a7ddc17a6c41c93326024c42920d7ee630d04950e6926645c0fe"
[[package]]
name = "epaint"
-version = "0.33.3"
-source = "git+https://github.com/ioncodes/egui.git#5aeebf13a9d68f49766273104fbde0a5ab6e38fc"
+version = "0.34.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92b452e348c2758115288802ca25f86ee286ce2cfae6643711ce116662311310"
dependencies = [
"ahash",
"bytemuck",
"ecolor",
"emath",
"epaint_default_fonts",
- "font-types 0.11.2",
+ "font-types",
"log",
"nohash-hasher",
"parking_lot",
"profiling",
"self_cell",
- "skrifa 0.40.0",
+ "skrifa",
"smallvec",
"vello_cpu",
]
[[package]]
name = "epaint_default_fonts"
-version = "0.33.3"
-source = "git+https://github.com/ioncodes/egui.git#5aeebf13a9d68f49766273104fbde0a5ab6e38fc"
+version = "0.34.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1644e25dbe3d663fd9c2a4181772c64b23361e377e550c10422ecc3a7de1c3c2"
[[package]]
name = "equator"
@@ -2018,23 +2008,9 @@ checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
[[package]]
name = "fax"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f05de7d48f37cd6730705cbca900770cab77a89f413d23e100ad7fad7795a0ab"
-dependencies = [
- "fax_derive",
-]
-
-[[package]]
-name = "fax_derive"
-version = "0.2.0"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
+checksum = "caf1079563223d5d59d83c85886a56e586cfd5c1a26292e971a0fa266531ac5a"
[[package]]
name = "fdeflate"
@@ -2106,18 +2082,9 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
[[package]]
name = "font-types"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39a654f404bbcbd48ea58c617c2993ee91d1cb63727a37bf2323a4edeed1b8c5"
-dependencies = [
- "bytemuck",
-]
-
-[[package]]
-name = "font-types"
-version = "0.11.2"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d9237c6d82152100c691fb77ea18037b402bcc7257d2c876a4ffac81bc22a1c"
+checksum = "5b38ad915f6dadd993ced50848a8291a543bd41ca62bc10740d5e64e2ab4cfd7"
dependencies = [
"bytemuck",
]
@@ -2328,21 +2295,27 @@ name = "gecko-app"
version = "0.1.0"
dependencies = [
"anyhow",
+ "backend-wgpu",
"bincode 2.0.1",
"clap",
+ "cpal",
"futures",
+ "gecko",
"iced",
"iced_aw",
"image 0.1.0",
"rfd",
+ "ringbuf",
"serde",
"serde_bytes",
+ "spin_sleep",
"tokio",
"toml",
"tracing",
"tracing-subscriber",
"walkdir",
"webbrowser",
+ "wgpu",
]
[[package]]
@@ -2387,11 +2360,24 @@ dependencies = [
"cfg-if",
"js-sys",
"libc",
- "r-efi",
+ "r-efi 5.3.0",
"wasip2",
"wasm-bindgen",
]
+[[package]]
+name = "getrandom"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi 6.0.0",
+ "wasip2",
+ "wasip3",
+]
+
[[package]]
name = "gif"
version = "0.14.2"
@@ -2454,9 +2440,9 @@ checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
[[package]]
name = "glow"
-version = "0.16.0"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08"
+checksum = "29038e1c483364cc6bb3cf78feee1816002e127c331a1eec55a4d202b9e1adb5"
dependencies = [
"js-sys",
"slotmap",
@@ -2473,37 +2459,6 @@ dependencies = [
"gl_generator",
]
-[[package]]
-name = "gpu-alloc"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
-dependencies = [
- "bitflags 2.11.0",
- "gpu-alloc-types",
-]
-
-[[package]]
-name = "gpu-alloc-types"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
-dependencies = [
- "bitflags 2.11.0",
-]
-
-[[package]]
-name = "gpu-allocator"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd"
-dependencies = [
- "log",
- "presser",
- "thiserror 1.0.69",
- "windows 0.58.0",
-]
-
[[package]]
name = "gpu-allocator"
version = "0.28.0"
@@ -2515,7 +2470,7 @@ dependencies = [
"log",
"presser",
"thiserror 2.0.18",
- "windows 0.62.2",
+ "windows",
]
[[package]]
@@ -2524,7 +2479,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"gpu-descriptor-types",
"hashbrown 0.15.5",
]
@@ -2535,7 +2490,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
]
[[package]]
@@ -2562,14 +2517,14 @@ dependencies = [
[[package]]
name = "harfrust"
-version = "0.3.2"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92c020db12c71d8a12a3fe7607873cade3a01a6287e29d540c8723276221b9d8"
+checksum = "9da2e5ae821f6e96664977bf974d6d6a2d6682f9ccee23e62ec1d134246845f9"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"bytemuck",
"core_maths",
- "read-fonts 0.35.0",
+ "read-fonts",
"smallvec",
]
@@ -2597,9 +2552,9 @@ dependencies = [
[[package]]
name = "hashbrown"
-version = "0.17.0"
+version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
+checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
[[package]]
name = "hdrhistogram"
@@ -2637,10 +2592,11 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
[[package]]
name = "hotpath"
-version = "0.16.0"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0482d7c2c47acfec79b90e55188e8b86c66fd9d541335eac3ce3f73055984643"
+checksum = "bff002d5c53fa1c6891f32156b9451d16654bc8a761894d7660b25c0a332d517"
dependencies = [
+ "arc-swap",
"cfg-if",
"clap",
"crossbeam-channel",
@@ -2668,9 +2624,9 @@ dependencies = [
[[package]]
name = "hotpath-macros"
-version = "0.16.0"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0a541a2ab3263fcf42ff399ec68ddd458f4883aa656c6229f59092f94058eb2"
+checksum = "9e2f4ac4534511584b7082657e133dcf3d8727b2f456a6b2a2c3eb02b82c1277"
dependencies = [
"proc-macro2",
"quote",
@@ -2679,15 +2635,15 @@ dependencies = [
[[package]]
name = "hotpath-macros-meta"
-version = "0.16.0"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08986d10e50e7c6c8e1798fb1bd63cdf275c0b59d6aad05989d5d86a0f2cb06e"
+checksum = "a6a87070853e9402ec79184f8d8d930d7eb86cd274aecdcf973f73b6f40271b0"
[[package]]
name = "hotpath-meta"
-version = "0.16.0"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fec29ccaa713ecf406bb6717331972fd2b932d889ddcc2bada67b264693fb9bf"
+checksum = "c31cfef2b9d280ad754c23b40b50cc74676489597f3cebfe0c180389e08a53ed"
dependencies = [
"hotpath-macros-meta",
]
@@ -2813,7 +2769,7 @@ dependencies = [
"js-sys",
"log",
"wasm-bindgen",
- "windows-core 0.62.2",
+ "windows-core",
]
[[package]]
@@ -2827,9 +2783,8 @@ dependencies = [
[[package]]
name = "iced"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "000e01026c93ba643f8357a3db3ada0e6555265a377f6f9291c472f6dd701fb3"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced.git?rev=0d12e964da8c3f0f7a02d3d731e3187eecfe5779#0d12e964da8c3f0f7a02d3d731e3187eecfe5779"
dependencies = [
"iced_core",
"iced_debug",
@@ -2845,73 +2800,45 @@ dependencies = [
[[package]]
name = "iced_aw"
version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b7f923642b024c415150b70ef84ee5c11626e3b0af73b954d817d573bcd0a4"
+source = "git+https://github.com/ioncodes/iced_aw.git?rev=0d6fe5f62ea12bfbbc97bf7076cc6063acf23c3f#0d6fe5f62ea12bfbbc97bf7076cc6063acf23c3f"
dependencies = [
"cfg-if",
"iced_core",
- "iced_fonts",
"iced_widget",
"web-time",
]
[[package]]
name = "iced_core"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ab1937d699403e7e69252ae743a902bcee9f4ab2052cc4c9a46fcf34729d85"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced.git?rev=0d12e964da8c3f0f7a02d3d731e3187eecfe5779#0d12e964da8c3f0f7a02d3d731e3187eecfe5779"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"bytes",
"glam 0.25.0",
"lilt",
"log",
"num-traits",
"rustc-hash 2.1.2",
- "smol_str",
+ "smol_str 0.2.2",
"thiserror 2.0.18",
"web-time",
]
[[package]]
name = "iced_debug"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25035ab0215a620e53f4103e36fc4e59a1fb2817e4bfc38a30ad27b4202ea0be"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced.git?rev=0d12e964da8c3f0f7a02d3d731e3187eecfe5779#0d12e964da8c3f0f7a02d3d731e3187eecfe5779"
dependencies = [
"iced_core",
"iced_futures",
"log",
]
-[[package]]
-name = "iced_fonts"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "214cff7c8499e328774216690e58e315a1a5f8f6fdd1035aed6298e62ffc4c1d"
-dependencies = [
- "iced_core",
- "iced_fonts_macros",
- "iced_widget",
-]
-
-[[package]]
-name = "iced_fonts_macros"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef5125e110cb19cd1910a28298661c98c5d9ab02eef43594968352940e8752e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "ttf-parser",
-]
-
[[package]]
name = "iced_futures"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c0c85ccad42dfbec7293c36c018af0ea0dbcc52d137a4a9a0b0f6822a3fdf0a"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced.git?rev=0d12e964da8c3f0f7a02d3d731e3187eecfe5779#0d12e964da8c3f0f7a02d3d731e3187eecfe5779"
dependencies = [
"futures",
"iced_core",
@@ -2924,11 +2851,10 @@ dependencies = [
[[package]]
name = "iced_graphics"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234ca1c2cec4155055f68fa5fad1b5242c496ac8238d80a259bca382fb44a102"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced.git?rev=0d12e964da8c3f0f7a02d3d731e3187eecfe5779#0d12e964da8c3f0f7a02d3d731e3187eecfe5779"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"bytemuck",
"cosmic-text",
"half",
@@ -2945,9 +2871,8 @@ dependencies = [
[[package]]
name = "iced_program"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dfafec2947cda688d8eb00dac337ba11aa60f9ef6335aed343e189d26e4a673"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced.git?rev=0d12e964da8c3f0f7a02d3d731e3187eecfe5779#0d12e964da8c3f0f7a02d3d731e3187eecfe5779"
dependencies = [
"iced_graphics",
"iced_runtime",
@@ -2955,9 +2880,8 @@ dependencies = [
[[package]]
name = "iced_renderer"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "250cc0802408e8c077986ec56c7d07c65f423ee658a4b9fd795a1f2aae5dac05"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced.git?rev=0d12e964da8c3f0f7a02d3d731e3187eecfe5779#0d12e964da8c3f0f7a02d3d731e3187eecfe5779"
dependencies = [
"iced_graphics",
"iced_tiny_skia",
@@ -2968,9 +2892,8 @@ dependencies = [
[[package]]
name = "iced_runtime"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1889b819ce4c06674183242e336c8d49465665441396914dc07cc86f44fa8d4"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced.git?rev=0d12e964da8c3f0f7a02d3d731e3187eecfe5779#0d12e964da8c3f0f7a02d3d731e3187eecfe5779"
dependencies = [
"bytes",
"iced_core",
@@ -2981,9 +2904,8 @@ dependencies = [
[[package]]
name = "iced_tiny_skia"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe0acf8b75a3bc914aff5f2329fdffc1b36eeaea29dda0e4bd232f1c62e9cc3d"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced.git?rev=0d12e964da8c3f0f7a02d3d731e3187eecfe5779#0d12e964da8c3f0f7a02d3d731e3187eecfe5779"
dependencies = [
"bytemuck",
"cosmic-text",
@@ -2998,11 +2920,10 @@ dependencies = [
[[package]]
name = "iced_wgpu"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff144a999b0ca0f8a10257934500060240825c42e950ec0ebee9c8ae30561c13"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced.git?rev=0d12e964da8c3f0f7a02d3d731e3187eecfe5779#0d12e964da8c3f0f7a02d3d731e3187eecfe5779"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"bytemuck",
"cryoglyph",
"futures",
@@ -3013,14 +2934,13 @@ dependencies = [
"log",
"rustc-hash 2.1.2",
"thiserror 2.0.18",
- "wgpu 27.0.1",
+ "wgpu",
]
[[package]]
name = "iced_widget"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1596afa0d3109c2618e8bc12bae6c11d3064df8f95c42dfce570397dbe957ab"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced.git?rev=0d12e964da8c3f0f7a02d3d731e3187eecfe5779#0d12e964da8c3f0f7a02d3d731e3187eecfe5779"
dependencies = [
"iced_renderer",
"log",
@@ -3032,31 +2952,33 @@ dependencies = [
[[package]]
name = "iced_winit"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b7dbedc47562d1de3b9707d939f678b88c382004b7ab5a18f7a7dd723162d75"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced.git?rev=0d12e964da8c3f0f7a02d3d731e3187eecfe5779#0d12e964da8c3f0f7a02d3d731e3187eecfe5779"
dependencies = [
+ "arboard",
"iced_debug",
"iced_program",
+ "iced_runtime",
"log",
"mundy",
+ "objc2 0.5.2",
"rustc-hash 2.1.2",
"thiserror 2.0.18",
"tracing",
"wasm-bindgen-futures",
"web-sys",
- "window_clipboard",
- "winit",
+ "winit 0.30.8",
]
[[package]]
name = "icu_collections"
-version = "2.1.1"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
+checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
dependencies = [
"displaydoc",
"potential_utf",
+ "utf8_iter",
"yoke",
"zerofrom",
"zerovec",
@@ -3064,9 +2986,9 @@ dependencies = [
[[package]]
name = "icu_locale_core"
-version = "2.1.1"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
+checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
dependencies = [
"displaydoc",
"litemap",
@@ -3077,9 +2999,9 @@ dependencies = [
[[package]]
name = "icu_normalizer"
-version = "2.1.1"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
+checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
dependencies = [
"icu_collections",
"icu_normalizer_data",
@@ -3091,15 +3013,15 @@ dependencies = [
[[package]]
name = "icu_normalizer_data"
-version = "2.1.1"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
+checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
[[package]]
name = "icu_properties"
-version = "2.1.2"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec"
+checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
dependencies = [
"icu_collections",
"icu_locale_core",
@@ -3111,15 +3033,15 @@ dependencies = [
[[package]]
name = "icu_properties_data"
-version = "2.1.2"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af"
+checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
[[package]]
name = "icu_provider"
-version = "2.1.1"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
+checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
dependencies = [
"displaydoc",
"icu_locale_core",
@@ -3130,6 +3052,12 @@ dependencies = [
"zerovec",
]
+[[package]]
+name = "id-arena"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
+
[[package]]
name = "idb-rs"
version = "0.1.13"
@@ -3167,9 +3095,9 @@ dependencies = [
[[package]]
name = "idna_adapter"
-version = "1.2.1"
+version = "1.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714"
dependencies = [
"icu_normalizer",
"icu_properties",
@@ -3235,12 +3163,14 @@ checksum = "964de6e86d545b246d84badc0fef527924ace5134f30641c203ef52ba83f58d5"
[[package]]
name = "indexmap"
-version = "2.13.0"
+version = "2.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
dependencies = [
"equivalent",
- "hashbrown 0.16.1",
+ "hashbrown 0.17.1",
+ "serde",
+ "serde_core",
]
[[package]]
@@ -3409,12 +3339,10 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.94"
+version = "0.3.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e04e2ef80ce82e13552136fabeef8a5ed1f985a96805761cbb9a2c34e7664d9"
+checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3"
dependencies = [
- "cfg-if",
- "futures-util",
"once_cell",
"wasm-bindgen",
]
@@ -3466,12 +3394,13 @@ dependencies = [
[[package]]
name = "kurbo"
-version = "0.13.0"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7564e90fe3c0d5771e1f0bc95322b21baaeaa0d9213fa6a0b61c99f8b17b3bfb"
+checksum = "4b60dfc32f652b926df6192e55525b16d186c69d47876c3ead4da5cc9f8450e2"
dependencies = [
"arrayvec",
"euclid",
+ "polycool",
"smallvec",
]
@@ -3482,11 +3411,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba4ebbd48ce411c1d10fb35185f5a51a7bfa3d8b24b4e330d30c9e3a34129501"
dependencies = [
"ascii-canvas",
- "bit-set",
+ "bit-set 0.8.0",
"ena",
"itertools 0.14.0",
"lalrpop-util",
- "petgraph",
+ "petgraph 0.7.1",
"regex",
"regex-syntax",
"sha3",
@@ -3512,6 +3441,12 @@ version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+[[package]]
+name = "leb128fmt"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
+
[[package]]
name = "lebe"
version = "0.5.3"
@@ -3586,9 +3521,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.183"
+version = "0.2.186"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
[[package]]
name = "libfuzzer-sys"
@@ -3627,14 +3562,14 @@ dependencies = [
[[package]]
name = "libredox"
-version = "0.1.15"
+version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ddbf48fd451246b1f8c2610bd3b4ac0cc6e149d89832867093ab69a17194f08"
+checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"libc",
"plain",
- "redox_syscall 0.7.3",
+ "redox_syscall 0.7.5",
]
[[package]]
@@ -3666,9 +3601,9 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
[[package]]
name = "litemap"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
+checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
[[package]]
name = "litrs"
@@ -3799,15 +3734,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "malloc_buf"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "matchers"
version = "0.2.0"
@@ -3847,7 +3773,7 @@ dependencies = [
"tokio",
"tracing",
"tracing-subscriber",
- "wgpu 28.0.0",
+ "wgpu",
]
[[package]]
@@ -3883,36 +3809,6 @@ dependencies = [
"autocfg",
]
-[[package]]
-name = "metal"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00c15a6f673ff72ddcc22394663290f870fb224c1bfce55734a75c414150e605"
-dependencies = [
- "bitflags 2.11.0",
- "block",
- "core-graphics-types 0.2.0",
- "foreign-types",
- "log",
- "objc",
- "paste",
-]
-
-[[package]]
-name = "metal"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7047791b5bc903b8cd963014b355f71dc9864a9a0b727057676c1dcae5cbc15"
-dependencies = [
- "bitflags 2.11.0",
- "block",
- "core-graphics-types 0.2.0",
- "foreign-types",
- "log",
- "objc",
- "paste",
-]
-
[[package]]
name = "mimalloc"
version = "0.1.50"
@@ -4039,7 +3935,7 @@ dependencies = [
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
- "windows 0.62.2",
+ "windows",
"zbus",
]
@@ -4051,13 +3947,13 @@ checksum = "13d2233c9842d08cfe13f9eac96e207ca6a2ea10b80259ebe8ad0268be27d2af"
[[package]]
name = "naga"
-version = "27.0.3"
+version = "29.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "066cf25f0e8b11ee0df221219010f213ad429855f57c494f995590c861a9a7d8"
+checksum = "0dd91265cc2454558f659b3b4b9640f0ddb8cc6521277f166b8a8c181c898079"
dependencies = [
"arrayvec",
- "bit-set",
- "bitflags 2.11.0",
+ "bit-set 0.9.1",
+ "bitflags 2.11.1",
"cfg-if",
"cfg_aliases",
"codespan-reporting",
@@ -4076,38 +3972,12 @@ dependencies = [
]
[[package]]
-name = "naga"
-version = "28.0.0"
+name = "ndk"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "618f667225063219ddfc61251087db8a9aec3c3f0950c916b614e403486f1135"
+checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
dependencies = [
- "arrayvec",
- "bit-set",
- "bitflags 2.11.0",
- "cfg-if",
- "cfg_aliases",
- "codespan-reporting",
- "half",
- "hashbrown 0.16.1",
- "hexf-parse",
- "indexmap",
- "libm",
- "log",
- "num-traits",
- "once_cell",
- "rustc-hash 1.1.0",
- "spirv",
- "thiserror 2.0.18",
- "unicode-ident",
-]
-
-[[package]]
-name = "ndk"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
-dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"jni-sys 0.3.1",
"log",
"ndk-sys",
@@ -4139,11 +4009,11 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
[[package]]
name = "nix"
-version = "0.31.2"
+version = "0.31.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d6d0705320c1e6ba1d912b5e37cf18071b6c2e9b7fa8215a1e8a7651966f5d3"
+checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"cfg-if",
"cfg_aliases",
"libc",
@@ -4261,15 +4131,6 @@ dependencies = [
"syn",
]
-[[package]]
-name = "objc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-dependencies = [
- "malloc_buf",
-]
-
[[package]]
name = "objc-sys"
version = "0.3.5"
@@ -4301,7 +4162,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.5.1",
"libc",
"objc2 0.5.2",
@@ -4317,7 +4178,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.6.2",
"libc",
"objc2 0.6.4",
@@ -4338,7 +4199,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6948501a91121d6399b79abaa33a8aa4ea7857fe019f341b8c23ad6e81b79b08"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"libc",
"objc2 0.6.4",
"objc2-core-audio",
@@ -4363,7 +4224,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.5.1",
"objc2 0.5.2",
"objc2-core-location",
@@ -4376,7 +4237,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"objc2 0.6.4",
"objc2-foundation 0.3.2",
]
@@ -4411,7 +4272,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a89f2ec274a0cf4a32642b2991e8b351a404d290da87bb6a9a9d8632490bd1c"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"objc2 0.6.4",
]
@@ -4421,7 +4282,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.5.1",
"objc2 0.5.2",
"objc2-foundation 0.2.2",
@@ -4433,7 +4294,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"objc2 0.6.4",
"objc2-foundation 0.3.2",
]
@@ -4444,7 +4305,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.6.2",
"dispatch2",
"libc",
@@ -4457,7 +4318,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"dispatch2",
"objc2 0.6.4",
"objc2-core-foundation",
@@ -4473,7 +4334,7 @@ dependencies = [
"block2 0.5.1",
"objc2 0.5.2",
"objc2-foundation 0.2.2",
- "objc2-metal",
+ "objc2-metal 0.2.2",
]
[[package]]
@@ -4504,7 +4365,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"objc2 0.6.4",
"objc2-core-foundation",
"objc2-core-graphics",
@@ -4516,7 +4377,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"objc2 0.6.4",
"objc2-core-foundation",
"objc2-core-graphics",
@@ -4535,7 +4396,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.5.1",
"dispatch",
"libc",
@@ -4548,7 +4409,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.6.2",
"libc",
"objc2 0.6.4",
@@ -4561,7 +4422,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"objc2 0.6.4",
"objc2-core-foundation",
]
@@ -4584,23 +4445,35 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.5.1",
"objc2 0.5.2",
"objc2-foundation 0.2.2",
]
+[[package]]
+name = "objc2-metal"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0125f776a10d00af4152d74616409f0d4a2053a6f57fa5b7d6aa2854ac04794"
+dependencies = [
+ "bitflags 2.11.1",
+ "block2 0.6.2",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
[[package]]
name = "objc2-quartz-core"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.5.1",
"objc2 0.5.2",
"objc2-foundation 0.2.2",
- "objc2-metal",
+ "objc2-metal 0.2.2",
]
[[package]]
@@ -4609,10 +4482,11 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"objc2 0.6.4",
"objc2-core-foundation",
"objc2-foundation 0.3.2",
+ "objc2-metal 0.3.2",
]
[[package]]
@@ -4631,7 +4505,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.5.1",
"objc2 0.5.2",
"objc2-cloud-kit 0.2.2",
@@ -4646,6 +4520,18 @@ dependencies = [
"objc2-user-notifications",
]
+[[package]]
+name = "objc2-ui-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
+dependencies = [
+ "bitflags 2.11.1",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+]
+
[[package]]
name = "objc2-uniform-type-identifiers"
version = "0.2.2"
@@ -4663,7 +4549,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.5.1",
"objc2 0.5.2",
"objc2-core-location",
@@ -4708,9 +4594,9 @@ checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
[[package]]
name = "orbclient"
-version = "0.3.51"
+version = "0.3.54"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59aed3b33578edcfa1bc96a321d590d31832b6ad55a26f0313362ce687e9abd6"
+checksum = "a570f6bca41d29acb2139229a7c873ec99bc9a313bd10804081d89bfac8ff329"
dependencies = [
"libc",
"libredox",
@@ -4718,9 +4604,9 @@ dependencies = [
[[package]]
name = "ordered-float"
-version = "5.2.0"
+version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0218004a4aae742209bee9c3cef05672f6b2708be36a50add8eb613b1f2a4008"
+checksum = "b7d950ca161dc355eaf28f82b11345ed76c6e1f6eb1f4f4479e0323b9e2fbd0e"
dependencies = [
"num-traits",
]
@@ -4735,6 +4621,16 @@ dependencies = [
"pin-project-lite",
]
+[[package]]
+name = "os_pipe"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.2",
+]
+
[[package]]
name = "owned_ttf_parser"
version = "0.25.1"
@@ -4799,13 +4695,13 @@ checksum = "c5a797f0e07bdf071d15742978fc3128ec6c22891c31a3a931513263904c982a"
[[package]]
name = "peniko"
-version = "0.6.0"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2b6aadb221872732e87d465213e9be5af2849b0e8cc5300a8ba98fffa2e00a"
+checksum = "839c8299360d2e998bdb106dc0a6cd71dcc5f4df51df1b620361bf50e283cca6"
dependencies = [
"bytemuck",
"color",
- "kurbo 0.13.0",
+ "kurbo 0.13.1",
"linebender_resource_handle",
"smallvec",
]
@@ -4826,6 +4722,17 @@ dependencies = [
"indexmap",
]
+[[package]]
+name = "petgraph"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455"
+dependencies = [
+ "fixedbitset",
+ "hashbrown 0.15.5",
+ "indexmap",
+]
+
[[package]]
name = "phf_shared"
version = "0.11.3"
@@ -4837,18 +4744,18 @@ dependencies = [
[[package]]
name = "pin-project"
-version = "1.1.11"
+version = "1.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1749c7ed4bcaf4c3d0a3efc28538844fb29bcdd7d2b67b2be7e20ba861ff517"
+checksum = "2466b2336ed02bcdca6b294417127b90ec92038d1d5c4fbeac971a922e0e0924"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.1.11"
+version = "1.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b20ed30f105399776b9c883e68e536ef602a16ae6f596d2c473591d6ad64c6"
+checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b"
dependencies = [
"proc-macro2",
"quote",
@@ -4880,9 +4787,9 @@ dependencies = [
[[package]]
name = "pkg-config"
-version = "0.3.32"
+version = "0.3.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
[[package]]
name = "plain"
@@ -4896,7 +4803,7 @@ version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"crc32fast",
"fdeflate",
"flate2",
@@ -4923,6 +4830,15 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3"
+[[package]]
+name = "polycool"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50596ddc09eb5ad5f75cacd40209568e66df71baf86e1499a0e99c4cff12a5a6"
+dependencies = [
+ "arrayvec",
+]
+
[[package]]
name = "portable-atomic"
version = "1.13.1"
@@ -4931,18 +4847,18 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
[[package]]
name = "portable-atomic-util"
-version = "0.2.6"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "091397be61a01d4be58e7841595bd4bfedb15f1cd54977d79b8271e94ed799a3"
+checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618"
dependencies = [
"portable-atomic",
]
[[package]]
name = "potential_utf"
-version = "0.1.4"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
+checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
dependencies = [
"zerovec",
]
@@ -4968,6 +4884,16 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
+[[package]]
+name = "prettyplease"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
+
[[package]]
name = "prettytable-rs"
version = "0.10.0"
@@ -5001,9 +4927,9 @@ dependencies = [
[[package]]
name = "profiling"
-version = "1.0.17"
+version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773"
+checksum = "3d595e54a326bc53c1c197b32d295e14b169e3cfeaa8dc82b529f947fba6bcf5"
dependencies = [
"profiling-procmacros",
]
@@ -5020,9 +4946,9 @@ dependencies = [
[[package]]
name = "pxfm"
-version = "0.1.28"
+version = "0.1.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a041e753da8b807c9255f28de81879c78c876392ff2469cde94799b2896b9d"
+checksum = "e0c5ccf5294c6ccd63a74f1565028353830a9c2f5eb0c682c355c471726a6e3f"
[[package]]
name = "qoi"
@@ -5056,9 +4982,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
[[package]]
name = "quick-xml"
-version = "0.39.2"
+version = "0.39.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958f21e8e7ceb5a1aa7fa87fab28e7c75976e0bfe7e23ff069e0a260f894067d"
+checksum = "cdcc8dd4e2f670d309a5f0e83fe36dfdc05af317008fea29144da1a2ac858e5e"
dependencies = [
"memchr",
]
@@ -5134,11 +5060,17 @@ version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+[[package]]
+name = "r-efi"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
+
[[package]]
name = "rand"
-version = "0.9.3"
+version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ec095654a25171c2124e9e3393a930bddbffdc939556c914957a4c3e0a87166"
+checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
dependencies = [
"rand_chacha",
"rand_core",
@@ -5181,7 +5113,7 @@ version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"cassowary",
"compact_str",
"crossterm 0.28.1",
@@ -5252,7 +5184,7 @@ version = "11.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
]
[[package]]
@@ -5261,6 +5193,18 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
+[[package]]
+name = "raw-window-metal"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40d213455a5f1dc59214213c7330e074ddf8114c9a42411eb890c767357ce135"
+dependencies = [
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+ "objc2-quartz-core 0.3.2",
+]
+
[[package]]
name = "rayon"
version = "1.12.0"
@@ -5281,17 +5225,6 @@ dependencies = [
"crossbeam-utils",
]
-[[package]]
-name = "read-fonts"
-version = "0.35.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717cf23b488adf64b9d711329542ba34de147df262370221940dfabc2c91358"
-dependencies = [
- "bytemuck",
- "core_maths",
- "font-types 0.10.1",
-]
-
[[package]]
name = "read-fonts"
version = "0.37.0"
@@ -5299,7 +5232,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b634fabf032fab15307ffd272149b622260f55974d9fad689292a5d33df02e5"
dependencies = [
"bytemuck",
- "font-types 0.11.2",
+ "core_maths",
+ "font-types",
]
[[package]]
@@ -5317,16 +5251,16 @@ version = "0.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
]
[[package]]
name = "redox_syscall"
-version = "0.7.3"
+version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce70a74e890531977d37e532c34d45e9055d2409ed08ddba14529471ed0be16"
+checksum = "4666a1a60d8412eab19d94f6d13dcc9cea0a5ef4fdf6a5db306537413c661b1b"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
]
[[package]]
@@ -5368,7 +5302,7 @@ checksum = "de2c52737737f8609e94f975dee22854a2d5c125772d4b1cf292120f4d45c186"
dependencies = [
"allocator-api2",
"bumpalo",
- "hashbrown 0.17.0",
+ "hashbrown 0.17.1",
"log",
"rustc-hash 2.1.2",
"smallvec",
@@ -5427,7 +5361,7 @@ version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac633a08f39bf3268714799bd8c4a1a19c19c203d817d3448bb8b91c97817cf0"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"float-cmp",
"libloading",
"once_cell",
@@ -5536,9 +5470,9 @@ dependencies = [
[[package]]
name = "rmcp"
-version = "1.6.0"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e12ca9067b5ebfbd5b3fcdc4acfceb81aa7d5ab2a879dff7cb75d22434276aad"
+checksum = "0810a9f717d9828f475fe1f629f4c305c8464b7f496c3a854b58d29e65f4058e"
dependencies = [
"async-trait",
"base64",
@@ -5558,9 +5492,9 @@ dependencies = [
[[package]]
name = "rmcp-macros"
-version = "1.6.0"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7caa6743cc0888e433105fe1bc551a7f607940b126a37bc97b478e86064627eb"
+checksum = "6aefac48c364756e97f04c0401ba3231e8607882c7c1d92da0437dc16307904d"
dependencies = [
"darling",
"proc-macro2",
@@ -5576,7 +5510,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "beceb6f7bf81c73e73aeef6dd1356d9a1b2b4909e1f0fc3e59b034f9572d7b7f"
dependencies = [
"base64",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"serde",
"serde_derive",
"unicode-ident",
@@ -5651,7 +5585,7 @@ version = "0.38.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"errno",
"libc",
"linux-raw-sys 0.4.15",
@@ -5664,7 +5598,7 @@ version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"errno",
"libc",
"linux-raw-sys 0.12.1",
@@ -5823,7 +5757,7 @@ dependencies = [
"image 0.1.0",
"png",
"pollster",
- "wgpu 28.0.0",
+ "wgpu",
]
[[package]]
@@ -5854,7 +5788,7 @@ version = "3.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"core-foundation 0.10.1",
"core-foundation-sys",
"libc",
@@ -5879,9 +5813,9 @@ checksum = "b12e76d157a900eb52e81bc6e9f3069344290341720e9178cde2407113ac8d89"
[[package]]
name = "semver"
-version = "1.0.27"
+version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
[[package]]
name = "serde"
@@ -5969,9 +5903,9 @@ dependencies = [
[[package]]
name = "sha3"
-version = "0.10.8"
+version = "0.10.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
+checksum = "77fd7028345d415a4034cf8777cd4f8ab1851274233b45f84e3d955502d93874"
dependencies = [
"digest",
"keccak",
@@ -6025,9 +5959,9 @@ dependencies = [
[[package]]
name = "simd-adler32"
-version = "0.3.8"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
+checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
[[package]]
name = "simd_cesu8"
@@ -6056,19 +5990,9 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
[[package]]
name = "siphasher"
-version = "1.0.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e"
-
-[[package]]
-name = "skrifa"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c31071dedf532758ecf3fed987cdb4bd9509f900e026ab684b4ecb81ea49841"
-dependencies = [
- "bytemuck",
- "read-fonts 0.35.0",
-]
+checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
[[package]]
name = "skrifa"
@@ -6077,7 +6001,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fbdfe3d2475fbd7ddd1f3e5cf8288a30eb3e5f95832829570cd88115a7434ac"
dependencies = [
"bytemuck",
- "read-fonts 0.37.0",
+ "read-fonts",
]
[[package]]
@@ -6107,7 +6031,7 @@ version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"calloop 0.13.0",
"calloop-wayland-source 0.3.0",
"cursor-icon",
@@ -6132,7 +6056,7 @@ version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0512da38f5e2b31201a93524adb8d3136276fa4fe4aafab4e1f727a82b534cc0"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"calloop 0.14.4",
"calloop-wayland-source 0.4.1",
"cursor-icon",
@@ -6173,6 +6097,12 @@ dependencies = [
"serde",
]
+[[package]]
+name = "smol_str"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4aaa7368fcf4852a4c2dd92df0cace6a71f2091ca0a23391ce7f3a31833f1523"
+
[[package]]
name = "socket2"
version = "0.6.3"
@@ -6225,11 +6155,11 @@ dependencies = [
[[package]]
name = "spirv"
-version = "0.3.0+sdk-1.3.268.0"
+version = "0.4.0+sdk-1.4.341.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
+checksum = "d9571ea910ebd84c86af4b3ed27f9dbdc6ad06f17c5f96146b2b671e2976744f"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
]
[[package]]
@@ -6308,7 +6238,7 @@ version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "842f3cd369c2ba38966204f983eaa5e54a8e84a7d7159ed36ade2b6c335aae64"
dependencies = [
- "skrifa 0.40.0",
+ "skrifa",
"yazi",
"zeno",
]
@@ -6372,7 +6302,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
dependencies = [
"fastrand",
- "getrandom 0.3.4",
+ "getrandom 0.4.2",
"once_cell",
"rustix 1.1.4",
"windows-sys 0.61.2",
@@ -6547,8 +6477,8 @@ dependencies = [
"spin_sleep",
"tracing",
"tracing-subscriber",
- "wgpu 28.0.0",
- "winit",
+ "wgpu",
+ "winit 0.30.13",
]
[[package]]
@@ -6562,9 +6492,9 @@ dependencies = [
[[package]]
name = "tinystr"
-version = "0.8.2"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
+checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
dependencies = [
"displaydoc",
"zerovec",
@@ -6675,9 +6605,9 @@ dependencies = [
[[package]]
name = "toml_edit"
-version = "0.25.8+spec-1.1.0"
+version = "0.25.11+spec-1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16bff38f1d86c47f9ff0647e6838d7bb362522bdf44006c7068c2b1e606f1f3c"
+checksum = "0b59c4d22ed448339746c59b905d24568fcbb3ab65a500494f7b8c3e97739f2b"
dependencies = [
"indexmap",
"toml_datetime",
@@ -6717,11 +6647,11 @@ dependencies = [
[[package]]
name = "tower-http"
-version = "0.6.10"
+version = "0.6.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68d6fdd9f81c2819c9a8b0e0cd91660e7746a8e6ea2ba7c6b2b057985f6bcb51"
+checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"bytes",
"futures-util",
"http",
@@ -6807,6 +6737,17 @@ dependencies = [
"tracing-log",
]
+[[package]]
+name = "tree_magic_mini"
+version = "3.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8765b90061cba6c22b5831f675da109ae5561588290f9fa2317adab2714d5a6"
+dependencies = [
+ "memchr",
+ "nom",
+ "petgraph 0.8.3",
+]
+
[[package]]
name = "try-lock"
version = "0.2.5"
@@ -6848,9 +6789,9 @@ checksum = "8e28f89b80c87b8fb0cf04ab448d5dd0dd0ade2f8891bae878de66a75a28600e"
[[package]]
name = "typenum"
-version = "1.19.0"
+version = "1.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
+checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de"
[[package]]
name = "uds_windows"
@@ -6889,9 +6830,9 @@ checksum = "383ad40bb927465ec0ce7720e033cb4ca06912855fc35db31b5755d0de75b1ee"
[[package]]
name = "unicode-segmentation"
-version = "1.13.1"
+version = "1.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da36089a805484bcccfffe0739803392c8298778a2d2f09febf76fac5ad9025b"
+checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c"
[[package]]
name = "unicode-truncate"
@@ -6997,7 +6938,7 @@ dependencies = [
"hashbrown 0.16.1",
"log",
"peniko",
- "skrifa 0.40.0",
+ "skrifa",
"smallvec",
]
@@ -7045,18 +6986,27 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
[[package]]
name = "wasip2"
-version = "1.0.2+wasi-0.2.9"
+version = "1.0.3+wasi-0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
+dependencies = [
+ "wit-bindgen 0.57.1",
+]
+
+[[package]]
+name = "wasip3"
+version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
+checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
dependencies = [
- "wit-bindgen",
+ "wit-bindgen 0.51.0",
]
[[package]]
name = "wasm-bindgen"
-version = "0.2.117"
+version = "0.2.108"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0551fc1bb415591e3372d0bc4780db7e587d84e2a7e79da121051c5c4b89d0b0"
+checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566"
dependencies = [
"cfg-if",
"once_cell",
@@ -7067,19 +7017,23 @@ dependencies = [
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.67"
+version = "0.4.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03623de6905b7206edd0a75f69f747f134b7f0a2323392d664448bf2d3c5d87e"
+checksum = "70a6e77fd0ae8029c9ea0063f87c46fde723e7d887703d74ad2616d792e51e6f"
dependencies = [
+ "cfg-if",
+ "futures-util",
"js-sys",
+ "once_cell",
"wasm-bindgen",
+ "web-sys",
]
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.117"
+version = "0.2.108"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fbdf9a35adf44786aecd5ff89b4563a90325f9da0923236f6104e603c7e86be"
+checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -7087,9 +7041,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.117"
+version = "0.2.108"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dca9693ef2bab6d4e6707234500350d8dad079eb508dca05530c85dc3a529ff2"
+checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55"
dependencies = [
"bumpalo",
"proc-macro2",
@@ -7100,13 +7054,47 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.117"
+version = "0.2.108"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39129a682a6d2d841b6c429d0c51e5cb0ed1a03829d8b3d1e69a011e62cb3d3b"
+checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12"
dependencies = [
"unicode-ident",
]
+[[package]]
+name = "wasm-encoder"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
+dependencies = [
+ "leb128fmt",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasm-metadata"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
+dependencies = [
+ "anyhow",
+ "indexmap",
+ "wasm-encoder",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasmparser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
+dependencies = [
+ "bitflags 2.11.1",
+ "hashbrown 0.15.5",
+ "indexmap",
+ "semver",
+]
+
[[package]]
name = "wasmtime-internal-core"
version = "44.0.1"
@@ -7145,9 +7133,9 @@ dependencies = [
[[package]]
name = "wayland-backend"
-version = "0.3.14"
+version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa75f400b7f719bcd68b3f47cd939ba654cedeef690f486db71331eec4c6a406"
+checksum = "2857dd20b54e916ec7253b3d6b4d5c4d7d4ca2c33c2e11c6c76a99bd8744755d"
dependencies = [
"cc",
"downcast-rs",
@@ -7159,11 +7147,11 @@ dependencies = [
[[package]]
name = "wayland-client"
-version = "0.31.13"
+version = "0.31.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab51d9f7c071abeee76007e2b742499e535148035bb835f97aaed1338cf516c3"
+checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"rustix 1.1.4",
"wayland-backend",
"wayland-scanner",
@@ -7175,16 +7163,16 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"cursor-icon",
"wayland-backend",
]
[[package]]
name = "wayland-cursor"
-version = "0.31.13"
+version = "0.31.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b3298683470fbdc6ca40151dfc48c8f2fd4c41a26e13042f801f85002384091"
+checksum = "4a52d18780be9b1314328a3de5f930b73d2200112e3849ca6cb11822793fb34d"
dependencies = [
"rustix 1.1.4",
"wayland-client",
@@ -7193,11 +7181,11 @@ dependencies = [
[[package]]
name = "wayland-protocols"
-version = "0.32.11"
+version = "0.32.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b23b5df31ceff1328f06ac607591d5ba360cf58f90c8fad4ac8d3a55a3c4aec7"
+checksum = "563a85523cade2429938e790815fd7319062103b9f4a2dc806e9b53b95982d8f"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"wayland-backend",
"wayland-client",
"wayland-scanner",
@@ -7209,7 +7197,7 @@ version = "20250721.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40a1f863128dcaaec790d7b4b396cc9b9a7a079e878e18c47e6c2d2c5a8dcbb1"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"wayland-backend",
"wayland-client",
"wayland-protocols",
@@ -7218,11 +7206,11 @@ dependencies = [
[[package]]
name = "wayland-protocols-misc"
-version = "0.3.11"
+version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "429b99200febaf95d4f4e46deff6fe4382bcff3280ee16a41cf887b3c3364984"
+checksum = "6e9567599ef23e09b8dad6e429e5738d4509dfc46b3b21f32841a304d16b29c8"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"wayland-backend",
"wayland-client",
"wayland-protocols",
@@ -7231,11 +7219,11 @@ dependencies = [
[[package]]
name = "wayland-protocols-plasma"
-version = "0.3.11"
+version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d392fc283a87774afc9beefcd6f931582bb97fe0e6ced0b306a62cb1d026527c"
+checksum = "2b6d8cf1eb2c1c31ed1f5643c88a6e53538129d4af80030c8cabd1f9fa884d91"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"wayland-backend",
"wayland-client",
"wayland-protocols",
@@ -7244,11 +7232,11 @@ dependencies = [
[[package]]
name = "wayland-protocols-wlr"
-version = "0.3.11"
+version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78248e4cc0eff8163370ba5c158630dcae1f3497a586b826eca2ef5f348d6235"
+checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"wayland-backend",
"wayland-client",
"wayland-protocols",
@@ -7257,9 +7245,9 @@ dependencies = [
[[package]]
name = "wayland-scanner"
-version = "0.31.9"
+version = "0.31.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c86287151a309799b821ca709b7345a048a2956af05957c89cb824ab919fa4e3"
+checksum = "9c324a910fd86ebdc364a3e61ec1f11737d3b1d6c273c0239ee8ff4bc0d24b4a"
dependencies = [
"proc-macro2",
"quick-xml",
@@ -7268,9 +7256,9 @@ dependencies = [
[[package]]
name = "wayland-sys"
-version = "0.31.10"
+version = "0.31.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374f6b70e8e0d6bf9461a32988fd553b59ff630964924dad6e4a4eb6bd538d17"
+checksum = "d8eab23fefc9e41f8e841df4a9c707e8a8c4ed26e944ef69297184de2785e3be"
dependencies = [
"dlib",
"log",
@@ -7280,9 +7268,9 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.94"
+version = "0.3.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd70027e39b12f0849461e08ffc50b9cd7688d942c1c8e3c7b22273236b4dd0a"
+checksum = "312e32e551d92129218ea9a2452120f4aabc03529ef03e4d0d82fb2780608598"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -7300,9 +7288,9 @@ dependencies = [
[[package]]
name = "webbrowser"
-version = "1.2.0"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe985f41e291eecef5e5c0770a18d28390addb03331c043964d9e916453d6f16"
+checksum = "0fc95580916af1e68ff6a7be07446fc5db73ebf71cf092de939bbf5f7e189f72"
dependencies = [
"core-foundation 0.10.1",
"jni 0.22.4",
@@ -7360,41 +7348,12 @@ dependencies = [
[[package]]
name = "wgpu"
-version = "27.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfe68bac7cde125de7a731c3400723cadaaf1703795ad3f4805f187459cd7a77"
-dependencies = [
- "arrayvec",
- "bitflags 2.11.0",
- "cfg-if",
- "cfg_aliases",
- "document-features",
- "hashbrown 0.16.1",
- "js-sys",
- "log",
- "naga 27.0.3",
- "parking_lot",
- "portable-atomic",
- "profiling",
- "raw-window-handle",
- "smallvec",
- "static_assertions",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "wgpu-core 27.0.3",
- "wgpu-hal 27.0.4",
- "wgpu-types 27.0.1",
-]
-
-[[package]]
-name = "wgpu"
-version = "28.0.0"
+version = "29.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9cb534d5ffd109c7d1135f34cdae29e60eab94855a625dcfe1705f8bc7ad79f"
+checksum = "bb3feacc458f7bee8bc1737149b42b6c731aa461039a4264a67bb6681646b250"
dependencies = [
"arrayvec",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"bytemuck",
"cfg-if",
"cfg_aliases",
@@ -7402,7 +7361,7 @@ dependencies = [
"hashbrown 0.16.1",
"js-sys",
"log",
- "naga 28.0.0",
+ "naga",
"parking_lot",
"portable-atomic",
"profiling",
@@ -7412,60 +7371,28 @@ dependencies = [
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
- "wgpu-core 28.0.1",
- "wgpu-hal 28.0.1",
- "wgpu-types 28.0.0",
-]
-
-[[package]]
-name = "wgpu-core"
-version = "27.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27a75de515543b1897b26119f93731b385a19aea165a1ec5f0e3acecc229cae7"
-dependencies = [
- "arrayvec",
- "bit-set",
- "bit-vec",
- "bitflags 2.11.0",
- "bytemuck",
- "cfg_aliases",
- "document-features",
- "hashbrown 0.16.1",
- "indexmap",
- "log",
- "naga 27.0.3",
- "once_cell",
- "parking_lot",
- "portable-atomic",
- "profiling",
- "raw-window-handle",
- "rustc-hash 1.1.0",
- "smallvec",
- "thiserror 2.0.18",
- "wgpu-core-deps-apple 27.0.0",
- "wgpu-core-deps-emscripten 27.0.0",
- "wgpu-core-deps-windows-linux-android 27.0.0",
- "wgpu-hal 27.0.4",
- "wgpu-types 27.0.1",
+ "wgpu-core",
+ "wgpu-hal",
+ "wgpu-types",
]
[[package]]
name = "wgpu-core"
-version = "28.0.1"
+version = "29.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d23f4642f53f666adcfd2d3218ab174d1e6681101aef18696b90cbe64d1c10f9"
+checksum = "02da3ad1b568337f25513b317870960ef87073ea0945502e44b864b67a8c77b7"
dependencies = [
"arrayvec",
- "bit-set",
- "bit-vec",
- "bitflags 2.11.0",
+ "bit-set 0.9.1",
+ "bit-vec 0.9.1",
+ "bitflags 2.11.1",
"bytemuck",
"cfg_aliases",
"document-features",
"hashbrown 0.16.1",
"indexmap",
"log",
- "naga 28.0.0",
+ "naga",
"once_cell",
"parking_lot",
"portable-atomic",
@@ -7474,135 +7401,69 @@ dependencies = [
"rustc-hash 1.1.0",
"smallvec",
"thiserror 2.0.18",
- "wgpu-core-deps-apple 28.0.0",
- "wgpu-core-deps-emscripten 28.0.0",
- "wgpu-core-deps-windows-linux-android 28.0.0",
- "wgpu-hal 28.0.1",
- "wgpu-types 28.0.0",
+ "wgpu-core-deps-apple",
+ "wgpu-core-deps-emscripten",
+ "wgpu-core-deps-wasm",
+ "wgpu-core-deps-windows-linux-android",
+ "wgpu-hal",
+ "wgpu-naga-bridge",
+ "wgpu-types",
]
[[package]]
name = "wgpu-core-deps-apple"
-version = "27.0.0"
+version = "29.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0772ae958e9be0c729561d5e3fd9a19679bcdfb945b8b1a1969d9bfe8056d233"
+checksum = "62e51b5447e144b3dbba4feb01f80f4fa21696fa0cd99afb2c3df1affd6fdb28"
dependencies = [
- "wgpu-hal 27.0.4",
-]
-
-[[package]]
-name = "wgpu-core-deps-apple"
-version = "28.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87b7b696b918f337c486bf93142454080a32a37832ba8a31e4f48221890047da"
-dependencies = [
- "wgpu-hal 28.0.1",
-]
-
-[[package]]
-name = "wgpu-core-deps-emscripten"
-version = "27.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b06ac3444a95b0813ecfd81ddb2774b66220b264b3e2031152a4a29fda4da6b5"
-dependencies = [
- "wgpu-hal 27.0.4",
+ "wgpu-hal",
]
[[package]]
name = "wgpu-core-deps-emscripten"
-version = "28.0.0"
+version = "29.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34b251c331f84feac147de3c4aa3aa45112622a95dd7ee1b74384fa0458dbd79"
+checksum = "3487cd6293a963bc5c0c0396f6a2192043c50003c07f4efdccbad3d90ec9d819"
dependencies = [
- "wgpu-hal 28.0.1",
+ "wgpu-hal",
]
[[package]]
-name = "wgpu-core-deps-windows-linux-android"
-version = "27.0.0"
+name = "wgpu-core-deps-wasm"
+version = "29.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71197027d61a71748e4120f05a9242b2ad142e3c01f8c1b47707945a879a03c3"
+checksum = "0c2f2fb042f36920771deb0b966543c5751b18f3d327760ffc90f74e20b2dcd4"
dependencies = [
- "wgpu-hal 27.0.4",
+ "wgpu-hal",
]
[[package]]
name = "wgpu-core-deps-windows-linux-android"
-version = "28.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68ca976e72b2c9964eb243e281f6ce7f14a514e409920920dcda12ae40febaae"
-dependencies = [
- "wgpu-hal 28.0.1",
-]
-
-[[package]]
-name = "wgpu-hal"
-version = "27.0.4"
+version = "29.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b21cb61c57ee198bc4aff71aeadff4cbb80b927beb912506af9c780d64313ce"
+checksum = "1bfb01076d0aa08b0ba9bd741e178b5cc440f5abe99d9581323a4c8b5d1a1916"
dependencies = [
- "android_system_properties",
- "arrayvec",
- "ash",
- "bit-set",
- "bitflags 2.11.0",
- "block",
- "bytemuck",
- "cfg-if",
- "cfg_aliases",
- "core-graphics-types 0.2.0",
- "glow",
- "glutin_wgl_sys",
- "gpu-alloc",
- "gpu-allocator 0.27.0",
- "gpu-descriptor",
- "hashbrown 0.16.1",
- "js-sys",
- "khronos-egl",
- "libc",
- "libloading",
- "log",
- "metal 0.32.0",
- "naga 27.0.3",
- "ndk-sys",
- "objc",
- "once_cell",
- "ordered-float",
- "parking_lot",
- "portable-atomic",
- "portable-atomic-util",
- "profiling",
- "range-alloc",
- "raw-window-handle",
- "renderdoc-sys",
- "smallvec",
- "thiserror 2.0.18",
- "wasm-bindgen",
- "web-sys",
- "wgpu-types 27.0.1",
- "windows 0.58.0",
- "windows-core 0.58.0",
+ "wgpu-hal",
]
[[package]]
name = "wgpu-hal"
-version = "28.0.1"
+version = "29.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d6cb474beb218824dcc9e1ce679d973f719262789bfb27407da560cac20eeb"
+checksum = "31f8e1a9e7a8512f276f7c62e018c7fa8d60954303fed2e5750114332049193f"
dependencies = [
"android_system_properties",
"arrayvec",
"ash",
- "bit-set",
- "bitflags 2.11.0",
- "block",
+ "bit-set 0.9.1",
+ "bitflags 2.11.1",
+ "block2 0.6.2",
"bytemuck",
"cfg-if",
"cfg_aliases",
- "core-graphics-types 0.2.0",
"glow",
"glutin_wgl_sys",
- "gpu-allocator 0.28.0",
+ "gpu-allocator",
"gpu-descriptor",
"hashbrown 0.16.1",
"js-sys",
@@ -7610,10 +7471,13 @@ dependencies = [
"libc",
"libloading",
"log",
- "metal 0.33.0",
- "naga 28.0.0",
+ "naga",
"ndk-sys",
- "objc",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+ "objc2-metal 0.3.2",
+ "objc2-quartz-core 0.3.2",
"once_cell",
"ordered-float",
"parking_lot",
@@ -7622,40 +7486,41 @@ dependencies = [
"profiling",
"range-alloc",
"raw-window-handle",
+ "raw-window-metal",
"renderdoc-sys",
"smallvec",
"thiserror 2.0.18",
"wasm-bindgen",
+ "wayland-sys",
"web-sys",
- "wgpu-types 28.0.0",
- "windows 0.62.2",
- "windows-core 0.62.2",
+ "wgpu-naga-bridge",
+ "wgpu-types",
+ "windows",
+ "windows-core",
+ "windows-result",
]
[[package]]
-name = "wgpu-types"
-version = "27.0.1"
+name = "wgpu-naga-bridge"
+version = "29.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afdcf84c395990db737f2dd91628706cb31e86d72e53482320d368e52b5da5eb"
+checksum = "59c654c483f058800972c3645e95388a7eca31bf9fe1933bc20e036588a0be02"
dependencies = [
- "bitflags 2.11.0",
- "bytemuck",
- "js-sys",
- "log",
- "thiserror 2.0.18",
- "web-sys",
+ "naga",
+ "wgpu-types",
]
[[package]]
name = "wgpu-types"
-version = "28.0.0"
+version = "29.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e18308757e594ed2cd27dddbb16a139c42a683819d32a2e0b1b0167552f5840c"
+checksum = "a9bcc31518a0e9735aefebedb5f7a9ef3ed1c42549c9f4c882fa9060ceaac639"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"bytemuck",
"js-sys",
"log",
+ "raw-window-handle",
"web-sys",
]
@@ -7730,30 +7595,6 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-[[package]]
-name = "window_clipboard"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5654226305eaf2dde8853fb482861d28e5dcecbbd40cb88e8393d94bb80d733"
-dependencies = [
- "clipboard-win",
- "clipboard_macos",
- "clipboard_wayland",
- "clipboard_x11",
- "raw-window-handle",
- "thiserror 2.0.18",
-]
-
-[[package]]
-name = "windows"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
-dependencies = [
- "windows-core 0.58.0",
- "windows-targets 0.52.6",
-]
-
[[package]]
name = "windows"
version = "0.62.2"
@@ -7761,7 +7602,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"
dependencies = [
"windows-collections",
- "windows-core 0.62.2",
+ "windows-core",
"windows-future",
"windows-numerics",
]
@@ -7772,20 +7613,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610"
dependencies = [
- "windows-core 0.62.2",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.58.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
-dependencies = [
- "windows-implement 0.58.0",
- "windows-interface 0.58.0",
- "windows-result 0.2.0",
- "windows-strings 0.1.0",
- "windows-targets 0.52.6",
+ "windows-core",
]
[[package]]
@@ -7794,11 +7622,11 @@ version = "0.62.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
dependencies = [
- "windows-implement 0.60.2",
- "windows-interface 0.59.3",
+ "windows-implement",
+ "windows-interface",
"windows-link",
- "windows-result 0.4.1",
- "windows-strings 0.5.1",
+ "windows-result",
+ "windows-strings",
]
[[package]]
@@ -7807,22 +7635,11 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"
dependencies = [
- "windows-core 0.62.2",
+ "windows-core",
"windows-link",
"windows-threading",
]
-[[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-implement"
version = "0.60.2"
@@ -7834,17 +7651,6 @@ dependencies = [
"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-interface"
version = "0.59.3"
@@ -7868,19 +7674,10 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26"
dependencies = [
- "windows-core 0.62.2",
+ "windows-core",
"windows-link",
]
-[[package]]
-name = "windows-result"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
[[package]]
name = "windows-result"
version = "0.4.1"
@@ -7890,16 +7687,6 @@ dependencies = [
"windows-link",
]
-[[package]]
-name = "windows-strings"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
-dependencies = [
- "windows-result 0.2.0",
- "windows-targets 0.52.6",
-]
-
[[package]]
name = "windows-strings"
version = "0.5.1"
@@ -8149,6 +7936,57 @@ version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
+[[package]]
+name = "winit"
+version = "0.30.8"
+source = "git+https://github.com/iced-rs/winit.git?rev=05b8ff17a06562f0a10bb46e6eaacbe2a95cb5ed#05b8ff17a06562f0a10bb46e6eaacbe2a95cb5ed"
+dependencies = [
+ "ahash",
+ "android-activity",
+ "atomic-waker",
+ "bitflags 2.11.1",
+ "block2 0.5.1",
+ "bytemuck",
+ "calloop 0.13.0",
+ "cfg_aliases",
+ "concurrent-queue",
+ "core-foundation 0.9.4",
+ "core-graphics",
+ "cursor-icon",
+ "dpi 0.1.1",
+ "js-sys",
+ "libc",
+ "memmap2 0.9.10",
+ "ndk",
+ "objc2 0.5.2",
+ "objc2-app-kit 0.2.2",
+ "objc2-foundation 0.2.2",
+ "objc2-ui-kit 0.2.2",
+ "orbclient",
+ "percent-encoding",
+ "pin-project",
+ "raw-window-handle",
+ "redox_syscall 0.4.1",
+ "rustix 0.38.44",
+ "sctk-adwaita",
+ "smithay-client-toolkit 0.19.2",
+ "smol_str 0.2.2",
+ "tracing",
+ "unicode-segmentation",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-protocols-plasma",
+ "web-sys",
+ "web-time",
+ "windows-sys 0.52.0",
+ "x11-dl",
+ "x11rb",
+ "xkbcommon-dl",
+]
+
[[package]]
name = "winit"
version = "0.30.13"
@@ -8158,7 +7996,7 @@ dependencies = [
"ahash",
"android-activity",
"atomic-waker",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"block2 0.5.1",
"bytemuck",
"calloop 0.13.0",
@@ -8167,7 +8005,7 @@ dependencies = [
"core-foundation 0.9.4",
"core-graphics",
"cursor-icon",
- "dpi",
+ "dpi 0.1.2",
"js-sys",
"libc",
"memmap2 0.9.10",
@@ -8175,7 +8013,7 @@ dependencies = [
"objc2 0.5.2",
"objc2-app-kit 0.2.2",
"objc2-foundation 0.2.2",
- "objc2-ui-kit",
+ "objc2-ui-kit 0.2.2",
"orbclient",
"percent-encoding",
"pin-project",
@@ -8184,7 +8022,7 @@ dependencies = [
"rustix 0.38.44",
"sctk-adwaita",
"smithay-client-toolkit 0.19.2",
- "smol_str",
+ "smol_str 0.2.2",
"tracing",
"unicode-segmentation",
"wasm-bindgen",
@@ -8203,9 +8041,9 @@ dependencies = [
[[package]]
name = "winnow"
-version = "1.0.0"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8"
+checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1"
dependencies = [
"memchr",
]
@@ -8230,12 +8068,118 @@ name = "wit-bindgen"
version = "0.51.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
+dependencies = [
+ "wit-bindgen-rust-macro",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.57.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
+
+[[package]]
+name = "wit-bindgen-core"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
+dependencies = [
+ "anyhow",
+ "heck",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-bindgen-rust"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
+dependencies = [
+ "anyhow",
+ "heck",
+ "indexmap",
+ "prettyplease",
+ "syn",
+ "wasm-metadata",
+ "wit-bindgen-core",
+ "wit-component",
+]
+
+[[package]]
+name = "wit-bindgen-rust-macro"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
+dependencies = [
+ "anyhow",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wit-bindgen-core",
+ "wit-bindgen-rust",
+]
+
+[[package]]
+name = "wit-component"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
+dependencies = [
+ "anyhow",
+ "bitflags 2.11.1",
+ "indexmap",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "wasm-encoder",
+ "wasm-metadata",
+ "wasmparser",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-parser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
+dependencies = [
+ "anyhow",
+ "id-arena",
+ "indexmap",
+ "log",
+ "semver",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "unicode-xid",
+ "wasmparser",
+]
+
+[[package]]
+name = "wl-clipboard-rs"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9651471a32e87d96ef3a127715382b2d11cc7c8bb9822ded8a7cc94072eb0a3"
+dependencies = [
+ "libc",
+ "log",
+ "os_pipe",
+ "rustix 1.1.4",
+ "thiserror 2.0.18",
+ "tree_magic_mini",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-protocols-wlr",
+]
[[package]]
name = "writeable"
-version = "0.6.2"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
+checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
[[package]]
name = "x11-dl"
@@ -8281,7 +8225,7 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
"dlib",
"log",
"once_cell",
@@ -8314,9 +8258,9 @@ checksum = "e01738255b5a16e78bbb83e7fbba0a1e7dd506905cfc53f4622d89015a03fbb5"
[[package]]
name = "yoke"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
+checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
dependencies = [
"stable_deref_trait",
"yoke-derive",
@@ -8325,9 +8269,9 @@ dependencies = [
[[package]]
name = "yoke-derive"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
+checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
dependencies = [
"proc-macro2",
"quote",
@@ -8424,18 +8368,18 @@ dependencies = [
[[package]]
name = "zerofrom"
-version = "0.1.6"
+version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
dependencies = [
"zerofrom-derive",
]
[[package]]
name = "zerofrom-derive"
-version = "0.1.6"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
dependencies = [
"proc-macro2",
"quote",
@@ -8451,9 +8395,9 @@ checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
[[package]]
name = "zerotrie"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
+checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
dependencies = [
"displaydoc",
"yoke",
@@ -8462,9 +8406,9 @@ dependencies = [
[[package]]
name = "zerovec"
-version = "0.11.5"
+version = "0.11.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
+checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
dependencies = [
"yoke",
"zerofrom",
@@ -8473,9 +8417,9 @@ dependencies = [
[[package]]
name = "zerovec-derive"
-version = "0.11.2"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
+checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
dependencies = [
"proc-macro2",
"quote",
@@ -8484,9 +8428,9 @@ dependencies = [
[[package]]
name = "zip"
-version = "8.5.1"
+version = "8.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcab981e19633ebcf0b001ddd37dd802996098bc1864f90b7c5d970ce76c1d59"
+checksum = "2d04a6b5381502aa6087c94c669499eb1602eb9c5e8198e534de571f7154809b"
dependencies = [
"crc32fast",
"flate2",
@@ -8565,9 +8509,9 @@ dependencies = [
[[package]]
name = "zune-jpeg"
-version = "0.5.14"
+version = "0.5.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7a1c0af6e5d8d1363f4994b7a091ccf963d8b694f7da5b0b9cceb82da2c0a6"
+checksum = "27bc9d5b815bc103f142aa054f561d9187d191692ec7c2d1e2b4737f8dbd7296"
dependencies = [
"zune-core",
]
diff --git a/Cargo.toml b/Cargo.toml
index 5bb666c..6264dd5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,12 +38,17 @@ exclude = [
]
[patch.crates-io]
-egui = { git = "https://github.com/ioncodes/egui.git" }
-epaint = { git = "https://github.com/ioncodes/egui.git" }
-emath = { git = "https://github.com/ioncodes/egui.git" }
-ecolor = { git = "https://github.com/ioncodes/egui.git" }
-egui-wgpu = { git = "https://github.com/ioncodes/egui.git" }
-egui-winit = { git = "https://github.com/ioncodes/egui.git" }
+iced_core = { git = "https://github.com/iced-rs/iced.git", rev = "0d12e964da8c3f0f7a02d3d731e3187eecfe5779" }
+iced_widget = { git = "https://github.com/iced-rs/iced.git", rev = "0d12e964da8c3f0f7a02d3d731e3187eecfe5779" }
+iced_runtime = { git = "https://github.com/iced-rs/iced.git", rev = "0d12e964da8c3f0f7a02d3d731e3187eecfe5779" }
+iced_graphics = { git = "https://github.com/iced-rs/iced.git", rev = "0d12e964da8c3f0f7a02d3d731e3187eecfe5779" }
+iced_renderer = { git = "https://github.com/iced-rs/iced.git", rev = "0d12e964da8c3f0f7a02d3d731e3187eecfe5779" }
+iced_winit = { git = "https://github.com/iced-rs/iced.git", rev = "0d12e964da8c3f0f7a02d3d731e3187eecfe5779" }
+iced_wgpu = { git = "https://github.com/iced-rs/iced.git", rev = "0d12e964da8c3f0f7a02d3d731e3187eecfe5779" }
+iced_tiny_skia = { git = "https://github.com/iced-rs/iced.git", rev = "0d12e964da8c3f0f7a02d3d731e3187eecfe5779" }
+iced_futures = { git = "https://github.com/iced-rs/iced.git", rev = "0d12e964da8c3f0f7a02d3d731e3187eecfe5779" }
+iced_program = { git = "https://github.com/iced-rs/iced.git", rev = "0d12e964da8c3f0f7a02d3d731e3187eecfe5779" }
+iced_debug = { git = "https://github.com/iced-rs/iced.git", rev = "0d12e964da8c3f0f7a02d3d731e3187eecfe5779" }
[profile.release]
codegen-units = 1
diff --git a/README.md b/README.md
index c197900..1b18c01 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,23 @@ Prebuilt releases (including debug builds) can be downloaded [here](https://gith
./tinyapp --dsp dsp_rom.bin --coef dsp_coef.bin --dvd YourGame.rvz
```
+A more modern and friendly experience is provided via `gecko` ([short preview on YouTube](https://www.youtube.com/watch?v=wg62ie71JP0)):
+
+![launcher](images/launcher.png)
+
+It scans the configured GameCube and Wii folders for `.iso`, `.rvz` and `.zip` files. Double-clicking on a row opens a dedicated player window for that game. The decoded GameCube IPL and DSP files are expected to be inside the `system` folder and **must** be named exactly as follows:
+
+```
+<gecko exe dir>/
+ config.toml # settings
+ cache/library.bin # cached library
+ system/ # system file folder (!)
+ IPL.bin # GameCube only
+ dsp_rom.bin # GameCube and Wii
+ dsp_coef.bin # GameCube and Wii
+ fs/ # Wii only (NAND from Dolphin or real console)
+```
+
### Controls
Keybindings are currently hardcoded into `tinyapp` and `debugger`!
@@ -121,6 +138,7 @@ This is a table of the main projects. Refer to `crates/` to find out about all a
| Crate | Description |
| ----------- | ------------------------------------------------------------------------------------------------------------------------------- |
+| `app` | End-user library browser (binary name `gecko`): iced-based game list, double-click to play, per-game player window |
| `tinyapp` | Lightweight emulator application with an egui/wgpu GUI, optional Lua scripting |
| `debugger` | Interactive GUI debugger built on egui with rendering support, hooks and scripting capabilities |
| `web` | WebAssembly build of the emulator for browser deployment via wasm-bindgen, with optional debug UI |
@@ -132,7 +150,8 @@ This is a table of the main projects. Refer to `crates/` to find out about all a
git submodule init && git submodule update
cargo build -p multitool --release # multitool
-cargo build -p tinyapp --release # main application
+cargo build -p tinyapp --release # tinyapp
+cargo build -p gecko-app --release # library shell (binary: gecko)
cargo build -p debugger --release # debugger
wasm-pack build crates/web --target web --out-dir pkg --release # web version
```
diff --git a/crates/app/Cargo.toml b/crates/app/Cargo.toml
index 4904be0..729d5bd 100644
--- a/crates/app/Cargo.toml
+++ b/crates/app/Cargo.toml
@@ -9,8 +9,14 @@ path = "src/main.rs"
[dependencies]
image = { path = "../image" }
-iced = { version = "0.14.0", features = ["tokio", "advanced", "image"] }
-iced_aw = { version = "0.14.1", default-features = false, features = ["menu"] }
+gecko = { path = "../gecko" }
+backend-wgpu = { path = "../backend-wgpu" }
+wgpu = "29.0.3"
+cpal = "0.17.3"
+ringbuf = "0.5.0"
+spin_sleep = "1.3.3"
+iced = { git = "https://github.com/iced-rs/iced.git", rev = "0d12e964da8c3f0f7a02d3d731e3187eecfe5779", features = ["tokio", "advanced", "image"] }
+iced_aw = { git = "https://github.com/ioncodes/iced_aw.git", rev = "0d6fe5f62ea12bfbbc97bf7076cc6063acf23c3f", default-features = false, features = ["menu"] }
tokio = { version = "1.52.3", features = ["rt-multi-thread", "fs", "macros", "sync"] }
futures = { version = "0.3.32", default-features = false, features = ["std", "async-await"] }
serde = { version = "1.0.228", features = ["derive", "rc"] }
diff --git a/crates/app/src/app.rs b/crates/app/src/app.rs
index 6b061a0..e5335f9 100644
--- a/crates/app/src/app.rs
+++ b/crates/app/src/app.rs
@@ -1,20 +1,30 @@
+use std::collections::HashMap;
use std::path::PathBuf;
+use std::sync::Arc;
+use std::time::{Duration, Instant};
use iced::theme::Mode;
use iced::widget::{button, column, container, mouse_area, scrollable, stack, text};
-use iced::{Background, Border, Color, Element, Length, Padding, Subscription, Task, Theme};
+use iced::{Background, Border, Color, Element, Length, Padding, Subscription, Task, Theme, window};
use crate::cache::{self, LibraryCache};
use crate::config::{self, Config};
use crate::game::{CpuMode, Game, Platform, ThemePreference};
use crate::library::{self, ScanProgress};
+use crate::player::{self, PlayerState, PlayerStatus};
use crate::theme::{self, Palette};
use crate::widgets::{game_row, menubar, search_bar, statusbar};
const REPO_URL: &str = "https://github.com/ioncodes/gecko";
+const DOUBLE_CLICK_WINDOW: Duration = Duration::from_millis(400);
#[derive(Debug, Clone)]
pub enum Message {
+ Noop,
+ LibraryWindowOpened(window::Id),
+ PlayerWindowOpened(window::Id, Box<Game>, Arc<PlayerState>),
+ PlayerTick,
+ WindowClosed(window::Id),
LibraryPicked(Platform, Option<PathBuf>),
ScanRequested,
ScanProgress(ScanProgress),
@@ -23,15 +33,22 @@ pub enum Message {
MenuRescan,
MenuQuit,
MenuToggleCpu(CpuMode),
+ MenuToggleSkipIpl,
MenuSetTheme(ThemePreference),
MenuAbout,
AboutClose,
OpenRepo,
GameClicked(usize),
+ LaunchPlayer(usize),
SystemThemeLoaded(Mode),
SystemThemeChanged(Mode),
}
+pub struct PlayerWindow {
+ pub(crate) game: Game,
+ pub(crate) state: Arc<PlayerState>,
+}
+
pub struct App {
cache: LibraryCache,
config: Config,
@@ -44,10 +61,13 @@ pub struct App {
about_open: bool,
system_mode: Mode,
palette: Palette,
+ last_click: Option<(usize, Instant)>,
+ library_window: Option<window::Id>,
+ players: HashMap<window::Id, PlayerWindow>,
}
impl App {
- pub fn new(cli_gcn: Option<PathBuf>, cli_wii: Option<PathBuf>) -> (Self, Task<Message>) {
+ pub fn boot(cli_gcn: Option<PathBuf>, cli_wii: Option<PathBuf>) -> (Self, Task<Message>) {
let config = config::load(&config::config_path());
let cache = cache::load(&cache::cache_path());
@@ -70,9 +90,18 @@ impl App {
about_open: false,
system_mode: Mode::Light,
palette,
+ last_click: None,
+ library_window: None,
+ players: HashMap::new(),
};
+ let (_, open_lib) = window::open(window::Settings {
+ size: iced::Size::new(900.0, 720.0),
+ ..window::Settings::default()
+ });
+
let mut tasks: Vec<Task<Message>> = Vec::new();
+ tasks.push(open_lib.map(Message::LibraryWindowOpened));
tasks.push(iced::system::theme().map(Message::SystemThemeLoaded));
if has_any_root {
tasks.push(Task::done(Message::ScanRequested));
@@ -81,20 +110,58 @@ impl App {
(app, Task::batch(tasks))
}
- pub fn title(&self) -> String {
- "Gecko".to_owned()
+ pub fn title(&self, window_id: window::Id) -> String {
+ if Some(window_id) == self.library_window {
+ "Gecko".to_owned()
+ } else if let Some(player) = self.players.get(&window_id) {
+ format!("Gecko — {}", player.game.title)
+ } else {
+ "Gecko".to_owned()
+ }
}
- pub fn theme(&self) -> Theme {
+ pub fn theme(&self, _window_id: window::Id) -> Theme {
theme::theme(&self.palette)
}
pub fn subscription(&self) -> Subscription<Message> {
- iced::system::theme_changes().map(Message::SystemThemeChanged)
+ let mut subs = vec![
+ iced::system::theme_changes().map(Message::SystemThemeChanged),
+ window::close_events().map(Message::WindowClosed),
+ ];
+
+ if !self.players.is_empty() {
+ subs.push(window::frames().map(|_| Message::PlayerTick));
+ }
+
+ Subscription::batch(subs)
}
pub fn update(&mut self, message: Message) -> Task<Message> {
match message {
+ Message::Noop => Task::none(),
+ Message::LibraryWindowOpened(id) => {
+ self.library_window = Some(id);
+ Task::none()
+ }
+ Message::PlayerWindowOpened(id, game, state) => {
+ tracing::info!(window = ?id, title = %game.title, "player window opened");
+ self.players.insert(id, PlayerWindow { game: *game, state });
+ Task::none()
+ }
+ Message::PlayerTick => Task::none(),
+ Message::WindowClosed(id) => {
+ if Some(id) == self.library_window {
+ self.library_window = None;
+ iced::exit()
+ } else if let Some(player) = self.players.remove(&id) {
+ tracing::info!(window = ?id, "player window closed");
+ player.state.shutdown();
+ Task::none()
+ } else {
+ Task::none()
+ }
+ }
Message::LibraryPicked(_, None) => Task::none(),
Message::LibraryPicked(platform, Some(path)) => {
match platform {
@@ -170,6 +237,11 @@ impl App {
self.persist_config();
Task::none()
}
+ Message::MenuToggleSkipIpl => {
+ self.config.skip_ipl = !self.config.skip_ipl;
+ self.persist_config();
+ Task::none()
+ }
Message::MenuSetTheme(pref) => {
self.config.theme = pref;
self.persist_config();
@@ -191,10 +263,34 @@ impl App {
Task::none()
}
Message::GameClicked(idx) => {
- if let Some(game) = self.games.get(idx) {
- tracing::info!(path = %game.path.display(), title = %game.title, "game selected");
+ let now = Instant::now();
+ let is_double = self
+ .last_click
+ .is_some_and(|(prev, when)| prev == idx && now.duration_since(when) <= DOUBLE_CLICK_WINDOW);
+
+ if is_double {
+ self.last_click = None;
+ Task::done(Message::LaunchPlayer(idx))
+ } else {
+ self.last_click = Some((idx, now));
+ if let Some(game) = self.games.get(idx) {
+ tracing::info!(path = %game.path.display(), title = %game.title, "game selected");
+ }
+ Task::none()
}
- Task::none()
+ }
+ Message::LaunchPlayer(idx) => {
+ let Some(game) = self.games.get(idx).cloned() else {
+ return Task::none();
+ };
+
+ let state = PlayerState::new(&game, &self.config);
+ let (_, open) = window::open(window::Settings {
+ size: iced::Size::new(960.0, 720.0),
+ ..window::Settings::default()
+ });
+
+ open.map(move |id| Message::PlayerWindowOpened(id, Box::new(game.clone()), state.clone()))
}
Message::SystemThemeLoaded(mode) | Message::SystemThemeChanged(mode) => {
self.system_mode = mode;
@@ -204,7 +300,17 @@ impl App {
}
}
- pub fn view(&self) -> Element<'_, Message> {
+ pub fn view(&self, window_id: window::Id) -> Element<'_, Message> {
+ if Some(window_id) == self.library_window {
+ self.library_view()
+ } else if let Some(player) = self.players.get(&window_id) {
+ self.player_view(player)
+ } else {
+ container(text("")).width(Length::Fill).height(Length::Fill).into()
+ }
+ }
+
+ fn library_view(&self) -> Element<'_, Message> {
let palette = &self.palette;
let body: Element<'_, Message> = if self.games.is_empty() {
@@ -230,7 +336,7 @@ impl App {
let bg = palette.bg;
let text_color = palette.text;
let main = column![
- menubar::menubar(palette, self.config.cpu_mode, self.config.theme),
+ menubar::menubar(palette, self.config.cpu_mode, self.config.theme, self.config.skip_ipl),
search_bar::search_bar(palette, &self.search),
body,
statusbar::statusbar(palette, self.config.cpu_mode, self.games.len(), self.scanning),
@@ -253,6 +359,42 @@ impl App {
}
}
+ fn player_view<'a>(&'a self, player: &'a PlayerWindow) -> Element<'a, Message> {
+ let palette = &self.palette;
+ let bg = palette.bg;
+ let text_color = palette.text;
+
+ let status = player.state.status();
+ let shader: Element<'a, Message> = player::shader_widget(player.state.clone()).into();
+
+ let overlay: Option<Element<'a, Message>> = match &status {
+ PlayerStatus::Ready => None,
+ PlayerStatus::Booting => Some(self::overlay_card(
+ palette,
+ &format!("Loading {}", player.game.title),
+ Some("Decompressing disc and warming up CPU heatsink..."),
+ false,
+ )),
+ PlayerStatus::Failed(msg) => Some(self::overlay_card(palette, "Cannot start game", Some(msg), true)),
+ };
+
+ let body: Element<'a, Message> = if let Some(ov) = overlay {
+ stack![shader, ov].into()
+ } else {
+ shader
+ };
+
+ container(body)
+ .width(Length::Fill)
+ .height(Length::Fill)
+ .style(move |_| container::Style {
+ background: Some(Background::Color(bg)),
+ text_color: Some(text_color),
+ ..container::Style::default()
+ })
+ .into()
+ }
+
fn effective_library_roots(&self) -> Vec<PathBuf> {
let mut roots = Vec::new();
if let Some(p) = self
@@ -310,6 +452,65 @@ fn resolve_palette(pref: ThemePreference, system_mode: Mode) -> Palette {
Palette::for_mode(effective)
}
+fn overlay_card(palette: &Palette, title: &str, detail: Option<&str>, error: bool) -> Element<'static, Message> {
+ let bg = palette.bg;
+ let border_2 = palette.border_2;
+ let text_color = palette.text;
+ let dim = palette.text_dim;
+ let accent = if error { palette.purple } else { palette.accent };
+
+ let backdrop_color = Color {
+ a: 0.55,
+ ..(if palette.is_dark { Color::BLACK } else { palette.text })
+ };
+
+ let mut card_col = column![text(title.to_owned()).size(20).color(text_color)].spacing(8);
+ card_col = card_col.push(
+ container(text(""))
+ .width(40)
+ .height(2)
+ .style(move |_: &Theme| container::Style {
+ background: Some(Background::Color(accent)),
+ ..container::Style::default()
+ }),
+ );
+ if let Some(detail) = detail {
+ card_col = card_col.push(text(detail.to_owned()).size(12).color(dim));
+ }
+
+ let card: Element<'static, Message> = container(card_col.align_x(iced::Alignment::Center))
+ .width(Length::Fixed(420.0))
+ .padding(24)
+ .style(move |_: &Theme| container::Style {
+ background: Some(Background::Color(bg)),
+ border: Border {
+ color: border_2,
+ width: 1.0,
+ radius: 12.0.into(),
+ },
+ ..container::Style::default()
+ })
+ .into();
+
+ let backdrop: Element<'static, Message> = container(text(""))
+ .width(Length::Fill)
+ .height(Length::Fill)
+ .style(move |_: &Theme| container::Style {
+ background: Some(Background::Color(backdrop_color)),
+ ..container::Style::default()
+ })
+ .into();
+
+ let centered: Element<'static, Message> = container(card)
+ .width(Length::Fill)
+ .height(Length::Fill)
+ .center_x(Length::Fill)
+ .center_y(Length::Fill)
+ .into();
+
+ stack![backdrop, centered].into()
+}
+
fn about_overlay(palette: &Palette) -> Element<'static, Message> {
let bg = palette.bg;
let surface = palette.surface;
diff --git a/crates/app/src/config.rs b/crates/app/src/config.rs
index a9104ed..e1a0589 100644
--- a/crates/app/src/config.rs
+++ b/crates/app/src/config.rs
@@ -4,13 +4,63 @@ use serde::{Deserialize, Serialize};
use crate::game::{CpuMode, ThemePreference};
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(default)]
pub struct Config {
pub gcn_library: Option<PathBuf>,
pub wii_library: Option<PathBuf>,
pub cpu_mode: CpuMode,
pub theme: ThemePreference,
+ pub system_dir: Option<PathBuf>,
+ pub dsp_rom: Option<PathBuf>,
+ pub dsp_coef: Option<PathBuf>,
+ pub ipl: Option<PathBuf>,
+ #[serde(default = "self::default_skip_ipl")]
+ pub skip_ipl: bool,
+}
+
+fn default_skip_ipl() -> bool {
+ true
+}
+
+impl Default for Config {
+ fn default() -> Self {
+ Self {
+ gcn_library: None,
+ wii_library: None,
+ cpu_mode: CpuMode::default(),
+ theme: ThemePreference::default(),
+ system_dir: None,
+ dsp_rom: None,
+ dsp_coef: None,
+ ipl: None,
+ skip_ipl: self::default_skip_ipl(),
+ }
+ }
+}
+
+pub const DSP_ROM_FILE: &str = "dsp_rom.bin";
+pub const DSP_COEF_FILE: &str = "dsp_coef.bin";
+pub const IPL_FILE: &str = "IPL.bin";
+
+impl Config {
+ pub fn system_dir_resolved(&self) -> PathBuf {
+ if let Some(dir) = self.system_dir.as_ref() {
+ return dir.clone();
+ }
+ std::env::current_exe()
+ .ok()
+ .and_then(|exe| exe.parent().map(|p| p.join("system")))
+ .unwrap_or_else(|| PathBuf::from("system"))
+ }
+
+ pub fn resolve_in_dir(override_path: &Option<PathBuf>, system_dir: &Path, name: &str) -> Option<PathBuf> {
+ if let Some(p) = override_path {
+ return Some(p.clone());
+ }
+ let candidate = system_dir.join(name);
+ candidate.exists().then_some(candidate)
+ }
}
pub fn config_path() -> PathBuf {
diff --git a/crates/app/src/main.rs b/crates/app/src/main.rs
index 132f9ee..84bf0e5 100644
--- a/crates/app/src/main.rs
+++ b/crates/app/src/main.rs
@@ -3,6 +3,7 @@ mod cache;
mod config;
mod game;
mod library;
+mod player;
mod theme;
mod widgets;
@@ -22,19 +23,18 @@ struct Args {
fn main() -> iced::Result {
tracing_subscriber::fmt()
- .with_env_filter(EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info")))
+ .with_env_filter(EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("warn")))
.init();
let args = Args::parse();
- iced::application(
- move || app::App::new(args.gcn.clone(), args.wii.clone()),
+ iced::daemon(
+ move || app::App::boot(args.gcn.clone(), args.wii.clone()),
app::App::update,
app::App::view,
)
.title(app::App::title)
.theme(app::App::theme)
.subscription(app::App::subscription)
- .window_size((1100.0, 720.0))
.run()
}
diff --git a/crates/app/src/player.rs b/crates/app/src/player.rs
new file mode 100644
index 0000000..2bbb7b5
--- /dev/null
+++ b/crates/app/src/player.rs
@@ -0,0 +1,8 @@
+mod audio;
+mod emu_thread;
+mod input;
+mod state;
+mod widget;
+
+pub use state::{PlayerState, PlayerStatus};
+pub use widget::shader_widget;
diff --git a/crates/app/src/player/audio.rs b/crates/app/src/player/audio.rs
new file mode 100644
index 0000000..a732d22
--- /dev/null
+++ b/crates/app/src/player/audio.rs
@@ -0,0 +1,366 @@
+use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
+use cpal::{SampleFormat, SampleRate, StreamConfig, SupportedStreamConfig};
+use gecko::audio::{AidBlock, AudioSink};
+use ringbuf::HeapRb;
+use ringbuf::traits::{Consumer, Observer, Producer, Split};
+use std::sync::Arc;
+use std::sync::atomic::{AtomicU32, AtomicU64, Ordering};
+
+type Frame = (i16, i16);
+
+struct Resampler {
+ consumer: ringbuf::HeapCons<Frame>,
+ input_rate: Arc<AtomicU32>,
+ host_rate: u32,
+ prev: Frame,
+ next: Frame,
+ phase: f64,
+ primed: bool,
+}
+
+impl Resampler {
+ fn new(consumer: ringbuf::HeapCons<Frame>, input_rate: Arc<AtomicU32>, host_rate: u32) -> Self {
+ Self {
+ consumer,
+ input_rate,
+ host_rate,
+ prev: (0, 0),
+ next: (0, 0),
+ phase: 0.0,
+ primed: false,
+ }
+ }
+
+ #[inline]
+ fn next_frame(&mut self) -> Frame {
+ if self.host_rate == 0 {
+ return (0, 0);
+ }
+
+ let input_rate_u32 = self.input_rate.load(Ordering::Relaxed).max(1);
+ if input_rate_u32 == self.host_rate {
+ self.primed = false;
+ return self.consumer.try_pop().unwrap_or((0, 0));
+ }
+
+ if !self.primed {
+ let Some(prev) = self.consumer.try_pop() else {
+ return (0, 0);
+ };
+ self.prev = prev;
+ self.next = self.consumer.try_pop().unwrap_or(prev);
+ self.phase = 0.0;
+ self.primed = true;
+ }
+
+ let out = self::lerp_frame(self.prev, self.next, self.phase);
+ let input_rate = input_rate_u32 as f64;
+ self.phase += input_rate / self.host_rate as f64;
+
+ while self.phase >= 1.0 {
+ self.phase -= 1.0;
+ self.prev = self.next;
+ let Some(next) = self.consumer.try_pop() else {
+ self.primed = false;
+ break;
+ };
+ self.next = next;
+ }
+
+ out
+ }
+}
+
+#[inline]
+fn lerp_frame(a: Frame, b: Frame, t: f64) -> Frame {
+ let l = a.0 as f64 + (b.0 as f64 - a.0 as f64) * t;
+ let r = a.1 as f64 + (b.1 as f64 - a.1 as f64) * t;
+ (l.round() as i16, r.round() as i16)
+}
+
+pub struct CpalBackend {
+ pub sink: CpalAudioSink,
+ pub stream: cpal::Stream,
+}
+
+pub struct CpalAudioSink {
+ producer: ringbuf::HeapProd<Frame>,
+ overflow_counter: Arc<AtomicU64>,
+ sample_rate: Arc<AtomicU32>,
+ throttle_threshold: usize,
+}
+
+impl AudioSink for CpalAudioSink {
+ fn set_sample_rate(&mut self, sample_rate: u32) {
+ let old = self.sample_rate.swap(sample_rate, Ordering::Relaxed);
+ if old != sample_rate {
+ tracing::info!(
+ old_sample_rate = old,
+ new_sample_rate = sample_rate,
+ "Updated CPAL input sample rate"
+ );
+ }
+ }
+
+ #[inline(always)]
+ fn push_stereo_i16(&mut self, left: i16, right: i16) {
+ if self.producer.try_push((left, right)).is_err() {
+ self.overflow_counter.fetch_add(1, Ordering::Relaxed);
+ }
+ }
+
+ #[inline(always)]
+ fn push_stereo_block(&mut self, frames: &AidBlock) {
+ let pushed = self.producer.push_slice(frames);
+ if pushed < frames.len() {
+ let dropped = (frames.len() - pushed) as u64;
+ self.overflow_counter.fetch_add(dropped, Ordering::Relaxed);
+ }
+ }
+
+ #[inline]
+ fn should_throttle(&self) -> bool {
+ self.producer.occupied_len() >= self.throttle_threshold
+ }
+}
+
+pub fn open(emulated_rate: u32) -> Result<CpalBackend, String> {
+ let host = cpal::default_host();
+ let device = host
+ .default_output_device()
+ .ok_or_else(|| "no default output audio device".to_string())?;
+
+ let device_name = device
+ .description()
+ .map(|d| d.name().to_string())
+ .unwrap_or_else(|_| "<unknown>".into());
+ let supported = self::pick_supported_config(&device, emulated_rate)?;
+ let sample_format = supported.sample_format();
+ let host_rate = supported.sample_rate();
+ let host_channels = supported.channels() as usize;
+ let config: StreamConfig = supported.into();
+
+ if host_rate != emulated_rate {
+ tracing::warn!(
+ host_rate,
+ emulated_rate,
+ "Audio device does not support the emulated sample rate; resampling live audio"
+ );
+ }
+
+ let cap_frames = (emulated_rate.max(host_rate) as usize / 2).max(1024);
+ let throttle_threshold = (cap_frames / 4).max(1);
+ let rb = HeapRb::<Frame>::new(cap_frames);
+ let (producer, consumer) = rb.split();
+ let overflow_counter = Arc::new(AtomicU64::new(0));
+ let input_rate = Arc::new(AtomicU32::new(emulated_rate));
+ let mut resampler = Resampler::new(consumer, input_rate.clone(), host_rate);
+
+ tracing::info!(
+ device = %device_name,
+ host_rate,
+ host_channels,
+ emulated_rate,
+ ?sample_format,
+ ringbuf_capacity_frames = cap_frames,
+ throttle_threshold_frames = throttle_threshold,
+ "Opened CPAL output"
+ );
+
+ let err_fn = |err| tracing::error!(?err, "CPAL stream error");
+
+ let stream = match sample_format {
+ SampleFormat::F32 => device
+ .build_output_stream(
+ &config,
+ move |out: &mut [f32], _| {
+ self::write_f32(&mut resampler, out, host_channels);
+ },
+ err_fn,
+ None,
+ )
+ .map_err(|e| format!("build_output_stream f32: {e}"))?,
+ SampleFormat::I16 => device
+ .build_output_stream(
+ &config,
+ move |out: &mut [i16], _| {
+ self::write_i16(&mut resampler, out, host_channels);
+ },
+ err_fn,
+ None,
+ )
+ .map_err(|e| format!("build_output_stream i16: {e}"))?,
+ SampleFormat::U16 => device
+ .build_output_stream(
+ &config,
+ move |out: &mut [u16], _| {
+ self::write_u16(&mut resampler, out, host_channels);
+ },
+ err_fn,
+ None,
+ )
+ .map_err(|e| format!("build_output_stream u16: {e}"))?,
+ SampleFormat::U8 => device
+ .build_output_stream(
+ &config,
+ move |out: &mut [u8], _| {
+ self::write_u8(&mut resampler, out, host_channels);
+ },
+ err_fn,
+ None,
+ )
+ .map_err(|e| format!("build_output_stream u8: {e}"))?,
+ other => return Err(format!("unsupported CPAL sample format: {other:?}")),
+ };
+
+ stream.play().map_err(|e| format!("stream.play: {e}"))?;
+
+ Ok(CpalBackend {
+ sink: CpalAudioSink {
+ producer,
+ overflow_counter,
+ sample_rate: input_rate,
+ throttle_threshold,
+ },
+ stream,
+ })
+}
+
+fn config_score(cfg: &SupportedStreamConfig) -> u32 {
+ let fmt_score = match cfg.sample_format() {
+ SampleFormat::F32 => 0,
+ SampleFormat::I16 => 1,
+ SampleFormat::U16 => 2,
+ SampleFormat::U8 => 3,
+ _ => 1000,
+ };
+ let chan_score: u32 = if cfg.channels() == 2 { 0 } else { 10 };
+ fmt_score + chan_score
+}
+
+fn pick_supported_config(device: &cpal::Device, desired_rate: u32) -> Result<SupportedStreamConfig, String> {
+ let configs = device
+ .supported_output_configs()
+ .map_err(|e| format!("supported_output_configs: {e}"))?;
+
+ let target_rate: SampleRate = desired_rate;
+ let mut best_at_rate: Option<SupportedStreamConfig> = None;
+
+ for range in configs {
+ if range.min_sample_rate() <= target_rate && range.max_sample_rate() >= target_rate {
+ let candidate = range.with_sample_rate(target_rate);
+ match &best_at_rate {
+ None => best_at_rate = Some(candidate),
+ Some(prev) if self::config_score(&candidate) < self::config_score(prev) => {
+ best_at_rate = Some(candidate);
+ }
+ _ => {}
+ }
+ }
+ }
+
+ if let Some(cfg) = best_at_rate {
+ return Ok(cfg);
+ }
+
+ device
+ .default_output_config()
+ .map_err(|e| format!("default_output_config: {e}"))
+}
+
+#[inline]
+fn write_i16(resampler: &mut Resampler, out: &mut [i16], host_channels: usize) {
+ if host_channels == 0 {
+ return;
+ }
+
+ for slot in out.chunks_mut(host_channels) {
+ let (l, r) = resampler.next_frame();
+
+ if !slot.is_empty() {
+ slot[0] = l;
+ }
+
+ if slot.len() >= 2 {
+ slot[1] = r;
+ }
+
+ for s in slot.iter_mut().skip(2) {
+ *s = 0;
+ }
+ }
+}
+
+#[inline]
+fn write_f32(resampler: &mut Resampler, out: &mut [f32], host_channels: usize) {
+ if host_channels == 0 {
+ return;
+ }
+
+ let scale = 1.0 / 32768.0;
+ for slot in out.chunks_mut(host_channels) {
+ let (l, r) = resampler.next_frame();
+
+ if !slot.is_empty() {
+ slot[0] = l as f32 * scale;
+ }
+
+ if slot.len() >= 2 {
+ slot[1] = r as f32 * scale;
+ }
+
+ for s in slot.iter_mut().skip(2) {
+ *s = 0.0;
+ }
+ }
+}
+
+#[inline]
+fn write_u16(resampler: &mut Resampler, out: &mut [u16], host_channels: usize) {
+ if host_channels == 0 {
+ return;
+ }
+
+ for slot in out.chunks_mut(host_channels) {
+ let (l, r) = resampler.next_frame();
+ let lu = (l as u16) ^ 0x8000;
+ let ru = (r as u16) ^ 0x8000;
+
+ if !slot.is_empty() {
+ slot[0] = lu;
+ }
+
+ if slot.len() >= 2 {
+ slot[1] = ru;
+ }
+
+ for s in slot.iter_mut().skip(2) {
+ *s = 0x8000;
+ }
+ }
+}
+
+#[inline]
+fn write_u8(resampler: &mut Resampler, out: &mut [u8], host_channels: usize) {
+ if host_channels == 0 {
+ return;
+ }
+
+ for slot in out.chunks_mut(host_channels) {
+ let (l, r) = resampler.next_frame();
+ let lu = ((l >> 8) as u8) ^ 0x80;
+ let ru = ((r >> 8) as u8) ^ 0x80;
+
+ if !slot.is_empty() {
+ slot[0] = lu;
+ }
+
+ if slot.len() >= 2 {
+ slot[1] = ru;
+ }
+
+ for s in slot.iter_mut().skip(2) {
+ *s = 0x80;
+ }
+ }
+}
diff --git a/crates/app/src/player/emu_thread.rs b/crates/app/src/player/emu_thread.rs
new file mode 100644
index 0000000..6e1a117
--- /dev/null
+++ b/crates/app/src/player/emu_thread.rs
@@ -0,0 +1,39 @@
+use gecko::HostInput;
+use gecko::system::{System, SystemId};
+use spin_sleep::SpinSleeper;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::{Arc, Mutex};
+use std::time::Duration;
+
+pub fn run<const SYSTEM: SystemId>(
+ mut emulator: System<SYSTEM>,
+ input: Arc<Mutex<HostInput>>,
+ game_id: Option<String>,
+ throttle: bool,
+ shutdown: Arc<AtomicBool>,
+) {
+ let sleeper = SpinSleeper::default();
+ let throttle_step = Duration::from_micros(5);
+
+ while !shutdown.load(Ordering::Relaxed) {
+ while throttle && emulator.audio_sink.should_throttle() {
+ if shutdown.load(Ordering::Relaxed) {
+ break;
+ }
+ sleeper.sleep(throttle_step);
+ }
+
+ let input = *input.lock().unwrap();
+ emulator.apply_host_input(&input);
+ emulator.run_until_vsync();
+ }
+
+ if let Some(game_id) = game_id.as_deref() {
+ match emulator.save_jit_cache(game_id) {
+ Ok((ppc, dsp, vtx)) => {
+ tracing::info!(ppc_blocks = ppc, dsp_blocks = dsp, vtx_keys = vtx, "saved JIT cache")
+ }
+ Err(err) => tracing::warn!(?err, "failed to save JIT cache"),
+ }
+ }
+}
diff --git a/crates/app/src/player/input.rs b/crates/app/src/player/input.rs
new file mode 100644
index 0000000..fa491b4
--- /dev/null
+++ b/crates/app/src/player/input.rs
@@ -0,0 +1,83 @@
+use gecko::flipper::si::pad::{self, PadStatus, STICK_CENTER, STICK_MAX, STICK_MIN, TRIGGER_MAX, TRIGGER_MIN};
+use gecko::hollywood::ipc::usb as wiimote;
+use iced::keyboard::key::Code;
+
+#[inline(always)]
+fn set_bit<T: std::ops::BitOrAssign + std::ops::BitAndAssign + std::ops::Not<Output = T> + Copy>(
+ bits: &mut T,
+ mask: T,
+ on: bool,
+) {
+ if on {
+ *bits |= mask;
+ } else {
+ *bits &= !mask;
+ }
+}
+
+pub fn update_pad(pad: &mut PadStatus, key: Code, pressed: bool) {
+ match key {
+ Code::ArrowUp => pad.stick_y = if pressed { STICK_MAX } else { STICK_CENTER },
+ Code::ArrowDown => pad.stick_y = if pressed { STICK_MIN } else { STICK_CENTER },
+ Code::ArrowLeft => pad.stick_x = if pressed { STICK_MIN } else { STICK_CENTER },
+ Code::ArrowRight => pad.stick_x = if pressed { STICK_MAX } else { STICK_CENTER },
+
+ Code::KeyX => self::set_bit(&mut pad.buttons, pad::A, pressed),
+ Code::KeyZ => self::set_bit(&mut pad.buttons, pad::B, pressed),
+ Code::KeyC => self::set_bit(&mut pad.buttons, pad::X, pressed),
+ Code::KeyV => self::set_bit(&mut pad.buttons, pad::Y, pressed),
+ Code::Enter => self::set_bit(&mut pad.buttons, pad::START, pressed),
+
+ Code::KeyA => {
+ self::set_bit(&mut pad.buttons, pad::L, pressed);
+ pad.trigger_left = if pressed { TRIGGER_MAX } else { TRIGGER_MIN };
+ }
+ Code::KeyS => {
+ self::set_bit(&mut pad.buttons, pad::R, pressed);
+ pad.trigger_right = if pressed { TRIGGER_MAX } else { TRIGGER_MIN };
+ }
+ Code::KeyD => self::set_bit(&mut pad.buttons, pad::Z, pressed),
+
+ Code::KeyI => self::set_bit(&mut pad.buttons, pad::DPAD_UP, pressed),
+ Code::KeyK => self::set_bit(&mut pad.buttons, pad::DPAD_DOWN, pressed),
+ Code::KeyJ => self::set_bit(&mut pad.buttons, pad::DPAD_LEFT, pressed),
+ Code::KeyL => self::set_bit(&mut pad.buttons, pad::DPAD_RIGHT, pressed),
+
+ _ => {}
+ }
+}
+
+pub fn update_wiimote_keys(buttons: &mut u16, key: Code, pressed: bool) {
+ let mask = match key {
+ Code::Digit1 => wiimote::BTN_ONE,
+ Code::Digit2 => wiimote::BTN_TWO,
+ Code::Home => wiimote::BTN_HOME,
+ Code::Minus => wiimote::BTN_MINUS,
+ Code::Equal => wiimote::BTN_PLUS,
+ Code::ArrowUp => wiimote::BTN_UP,
+ Code::ArrowDown => wiimote::BTN_DOWN,
+ Code::ArrowLeft => wiimote::BTN_LEFT,
+ Code::ArrowRight => wiimote::BTN_RIGHT,
+ _ => return,
+ };
+ self::set_bit(buttons, mask, pressed);
+}
+
+pub fn update_wiimote_motion_keys(shake: &mut bool, key: Code, pressed: bool) {
+ if matches!(key, Code::ShiftLeft) {
+ *shake = pressed;
+ }
+}
+
+pub fn update_nunchuk_keys(buttons: &mut u8, stick_x: &mut u8, stick_y: &mut u8, key: Code, pressed: bool) {
+ use wiimote::{NUNCHUK_STICK_CENTER as C, NUNCHUK_STICK_MAX as MAX, NUNCHUK_STICK_MIN as MIN};
+ match key {
+ Code::KeyW => *stick_y = if pressed { MAX } else { C },
+ Code::KeyS => *stick_y = if pressed { MIN } else { C },
+ Code::KeyA => *stick_x = if pressed { MIN } else { C },
+ Code::KeyD => *stick_x = if pressed { MAX } else { C },
+ Code::KeyQ => self::set_bit(buttons, wiimote::NUNCHUK_BTN_Z, pressed),
+ Code::KeyE => self::set_bit(buttons, wiimote::NUNCHUK_BTN_C, pressed),
+ _ => {}
+ }
+}
diff --git a/crates/app/src/player/state.rs b/crates/app/src/player/state.rs
new file mode 100644
index 0000000..4aa04bf
--- /dev/null
+++ b/crates/app/src/player/state.rs
@@ -0,0 +1,379 @@
+use std::path::{Path, PathBuf};
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::{Arc, Mutex, OnceLock};
+
+use backend_wgpu::sink::{Renderer, TargetAspect};
+use gecko::audio::EmptyAudioSink;
+use gecko::gamecube::GameCube;
+use gecko::hollywood::ipc::usb;
+use gecko::wii::Wii;
+use gecko::{HostInput, system};
+use iced::keyboard::key::{Code, Physical};
+use iced::mouse::Button as MouseButton;
+
+use crate::config::{Config, DSP_COEF_FILE, DSP_ROM_FILE, IPL_FILE};
+use crate::game::{Game, Platform};
+use crate::player::{audio, emu_thread, input};
+
+struct BootParams {
+ disc_path: PathBuf,
+ dsp_path: Option<PathBuf>,
+ coef_path: Option<PathBuf>,
+ ipl_path: Option<PathBuf>,
+ skip_ipl: bool,
+}
+
+struct Initialized {
+ renderer: Renderer,
+ _audio_stream: Mutex<Option<cpal::Stream>>,
+}
+
+pub struct PlayerState {
+ boot: Mutex<Option<BootParams>>,
+ initialized: OnceLock<Initialized>,
+ shutdown: Arc<AtomicBool>,
+ aspect: TargetAspect,
+ input: Arc<Mutex<HostInput>>,
+ platform: Platform,
+ boot_error: Option<String>,
+ first_frame: Arc<AtomicBool>,
+}
+
+#[derive(Debug, Clone)]
+pub enum PlayerStatus {
+ Booting,
+ Failed(String),
+ Ready,
+}
+
+impl std::fmt::Debug for PlayerState {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ f.debug_struct("PlayerState").field("platform", &self.platform).finish()
+ }
+}
+
+impl PlayerState {
+ pub fn new(game: &Game, config: &Config) -> Arc<Self> {
+ let aspect = match game.platform {
+ Platform::Wii => TargetAspect::Ratio(16.0 / 9.0),
+ Platform::Gcn => TargetAspect::Ratio(4.0 / 3.0),
+ };
+ let neutral = match game.platform {
+ Platform::Wii => HostInput::wii_neutral(),
+ Platform::Gcn => HostInput::gc_connected(),
+ };
+
+ let system_dir = config.system_dir_resolved();
+ let dsp = Config::resolve_in_dir(&config.dsp_rom, &system_dir, DSP_ROM_FILE);
+ let coef = Config::resolve_in_dir(&config.dsp_coef, &system_dir, DSP_COEF_FILE);
+ let ipl = Config::resolve_in_dir(&config.ipl, &system_dir, IPL_FILE);
+ let boot_error = self::validate(game.platform, &dsp, &coef, &ipl, &system_dir);
+
+ Arc::new(Self {
+ boot: Mutex::new(Some(BootParams {
+ disc_path: game.path.clone(),
+ dsp_path: dsp,
+ coef_path: coef,
+ ipl_path: ipl,
+ skip_ipl: config.skip_ipl,
+ })),
+ initialized: OnceLock::new(),
+ shutdown: Arc::new(AtomicBool::new(false)),
+ aspect,
+ input: Arc::new(Mutex::new(neutral)),
+ platform: game.platform,
+ boot_error,
+ first_frame: Arc::new(AtomicBool::new(false)),
+ })
+ }
+
+ pub fn status(&self) -> PlayerStatus {
+ if let Some(err) = &self.boot_error {
+ return PlayerStatus::Failed(err.clone());
+ }
+ if self.first_frame.load(Ordering::Relaxed) {
+ return PlayerStatus::Ready;
+ }
+ PlayerStatus::Booting
+ }
+
+ pub fn blit(
+ &self,
+ encoder: &mut wgpu::CommandEncoder,
+ target: &wgpu::TextureView,
+ size: (u32, u32),
+ load: wgpu::LoadOp<wgpu::Color>,
+ ) {
+ if let Some(init) = self.initialized.get() {
+ init.renderer.blit_into_encoder(encoder, target, size, load);
+ }
+ }
+
+ pub fn start_boot(this: &Arc<Self>, device: &wgpu::Device, queue: &wgpu::Queue, format: wgpu::TextureFormat) {
+ if this.boot_error.is_some() || this.initialized.get().is_some() {
+ return;
+ }
+ let Some(params) = this.boot.lock().unwrap().take() else {
+ return;
+ };
+
+ let device = device.clone();
+ let queue = queue.clone();
+ let state = this.clone();
+ std::thread::Builder::new()
+ .name("gecko-player".into())
+ .spawn(move || self::player_thread(state, params, device, queue, format))
+ .expect("spawn player thread");
+ }
+
+ pub fn handle_keyboard(&self, key: Code, pressed: bool) {
+ let mut input_guard = self.input.lock().unwrap();
+ match &mut *input_guard {
+ HostInput::Gc(pad) => input::update_pad(pad, key, pressed),
+ HostInput::Wii {
+ wiimote_buttons,
+ wiimote_shake,
+ nunchuk_buttons,
+ nunchuk_stick_x,
+ nunchuk_stick_y,
+ ir_pointer: _,
+ } => {
+ input::update_wiimote_keys(wiimote_buttons, key, pressed);
+ input::update_wiimote_motion_keys(wiimote_shake, key, pressed);
+ input::update_nunchuk_keys(nunchuk_buttons, nunchuk_stick_x, nunchuk_stick_y, key, pressed);
+ }
+ }
+ }
+
+ pub fn handle_mouse_button(&self, button: MouseButton, pressed: bool) {
+ let mask = match button {
+ MouseButton::Left => usb::BTN_A,
+ MouseButton::Right => usb::BTN_B,
+ _ => return,
+ };
+
+ let mut input_guard = self.input.lock().unwrap();
+ if let HostInput::Wii { wiimote_buttons, .. } = &mut *input_guard {
+ if pressed {
+ *wiimote_buttons |= mask;
+ } else {
+ *wiimote_buttons &= !mask;
+ }
+ }
+ }
+
+ pub fn set_ir_pointer(&self, aim_x: f32, aim_y: f32) {
+ if self.platform != Platform::Wii {
+ return;
+ }
+ let (ir_x, ir_y) = self::aim_to_ir(aim_x, aim_y);
+ let mut input_guard = self.input.lock().unwrap();
+ if let HostInput::Wii { ir_pointer, .. } = &mut *input_guard {
+ *ir_pointer = Some((ir_x, ir_y));
+ }
+ }
+
+ pub fn clear_ir_pointer(&self) {
+ if self.platform != Platform::Wii {
+ return;
+ }
+ let mut input_guard = self.input.lock().unwrap();
+ if let HostInput::Wii { ir_pointer, .. } = &mut *input_guard {
+ *ir_pointer = None;
+ }
+ }
+
+ pub fn shutdown(&self) {
+ self.shutdown.store(true, Ordering::Relaxed);
+ }
+}
+
+impl Drop for PlayerState {
+ fn drop(&mut self) {
+ self.shutdown.store(true, Ordering::Relaxed);
+ }
+}
+
+pub fn physical_to_code(physical: &Physical) -> Option<Code> {
+ match physical {
+ Physical::Code(code) => Some(*code),
+ Physical::Unidentified(_) => None,
+ }
+}
+
+fn aim_to_ir(aim_x: f32, aim_y: f32) -> (u16, u16) {
+ const POINTER_SCALE_X: f64 = 0.44;
+ const POINTER_SCALE_Y: f64 = 0.66;
+ const POINTER_Y_OFFSET: f64 = 120.0;
+
+ let aim_x = (aim_x as f64).clamp(0.0, 1.0);
+ let aim_y = (aim_y as f64).clamp(0.0, 1.0);
+ let span_x = usb::IR_CAMERA_WIDTH as f64 * POINTER_SCALE_X;
+ let span_y = usb::IR_CAMERA_HEIGHT as f64 * POINTER_SCALE_Y;
+ let base_x = (usb::IR_CAMERA_WIDTH as f64 - span_x) / 2.0;
+ let base_y = (usb::IR_CAMERA_HEIGHT as f64 - span_y) / 2.0 + POINTER_Y_OFFSET;
+ let ir_x = (base_x + (1.0 - aim_x) * span_x) as u16;
+ let ir_y = (base_y + aim_y * span_y) as u16;
+ (ir_x, ir_y)
+}
+
+fn player_thread(
+ state: Arc<PlayerState>,
+ params: BootParams,
+ device: wgpu::Device,
+ queue: wgpu::Queue,
+ format: wgpu::TextureFormat,
+) {
+ let shutdown = state.shutdown.clone();
+ tracing::warn!(?format, path = %params.disc_path.display(), "player booting");
+
+ let dvd_data = match std::fs::read(&params.disc_path) {
+ Ok(b) => b,
+ Err(err) => {
+ tracing::error!(?err, path = %params.disc_path.display(), "read disc");
+ return;
+ }
+ };
+ if shutdown.load(Ordering::Relaxed) {
+ return;
+ }
+ let dvd = image::load_dvd(dvd_data);
+ let game_id = dvd.header().game_id();
+
+ let (renderer, sink) = Renderer::new(device, queue, format, state.aspect);
+ {
+ let first_frame = state.first_frame.clone();
+ renderer.set_frame_ready_callback(move |_| {
+ if !first_frame.swap(true, Ordering::Relaxed) {
+ tracing::warn!("first emu frame ready");
+ }
+ });
+ }
+
+ match state.platform {
+ Platform::Wii => {
+ let mut emu = Wii::apploader_hle(dvd).build();
+ self::configure_emu(&mut emu, &params, sink);
+ emu.apply_host_input(&HostInput::neutral_for(system::WII));
+ let audio = self::install_audio_sink(&mut emu);
+ let _ = emu.load_jit_cache(&game_id);
+ self::set_initialized(&state, renderer, audio, &game_id);
+ emu_thread::run::<{ system::WII }>(emu, state.input.clone(), Some(game_id), true, shutdown);
+ }
+ Platform::Gcn => {
+ let mut emu = self::build_gamecube(dvd, &params);
+ self::configure_emu(&mut emu, &params, sink);
+ emu.apply_host_input(&HostInput::neutral_for(system::GC));
+ let audio = self::install_audio_sink(&mut emu);
+ let _ = emu.load_jit_cache(&game_id);
+ self::set_initialized(&state, renderer, audio, &game_id);
+ emu_thread::run::<{ system::GC }>(emu, state.input.clone(), Some(game_id), true, shutdown);
+ }
+ }
+}
+
+fn build_gamecube(dvd: Box<dyn image::Dvd>, params: &BootParams) -> gecko::system::System<{ system::GC }> {
+ let Some(ipl_path) = params.ipl_path.as_deref() else {
+ return GameCube::with_ipl_hle(dvd);
+ };
+ match std::fs::read(ipl_path) {
+ Ok(ipl_data) => {
+ tracing::warn!(path = %ipl_path.display(), skip_ipl = params.skip_ipl, "booting via real IPL");
+ let mut emu = GameCube::with_ipl(&ipl_data, params.skip_ipl);
+ emu.insert_dvd(dvd);
+ emu
+ }
+ Err(err) => {
+ tracing::warn!(?err, path = %ipl_path.display(), "IPL.bin unreadable; falling back to IPL HLE");
+ GameCube::with_ipl_hle(dvd)
+ }
+ }
+}
+
+fn configure_emu<const S: gecko::system::SystemId>(
+ emu: &mut gecko::system::System<S>,
+ params: &BootParams,
+ sink: backend_wgpu::sink::ThreadedSink,
+) {
+ self::load_dsp_roms(emu, params.dsp_path.as_deref(), params.coef_path.as_deref());
+ emu.render_sink = Box::new(sink);
+}
+
+fn set_initialized(state: &Arc<PlayerState>, renderer: Renderer, audio: Option<cpal::Stream>, game_id: &str) {
+ let _ = state.initialized.set(Initialized {
+ renderer,
+ _audio_stream: Mutex::new(audio),
+ });
+ tracing::warn!(game = %game_id, "player boot complete");
+}
+
+fn validate(
+ platform: Platform,
+ dsp: &Option<PathBuf>,
+ coef: &Option<PathBuf>,
+ ipl: &Option<PathBuf>,
+ system_dir: &Path,
+) -> Option<String> {
+ let mut missing: Vec<&'static str> = Vec::new();
+ if dsp.is_none() {
+ missing.push(DSP_ROM_FILE);
+ }
+ if coef.is_none() {
+ missing.push(DSP_COEF_FILE);
+ }
+ if platform == Platform::Gcn && ipl.is_none() {
+ missing.push(IPL_FILE);
+ }
+
+ if missing.is_empty() {
+ return None;
+ }
+
+ let needed = match platform {
+ Platform::Gcn => "GameCube games require IPL.bin, dsp_rom.bin and dsp_coef.bin",
+ Platform::Wii => "Wii games require dsp_rom.bin and dsp_coef.bin",
+ };
+
+ Some(format!(
+ "{needed}.\n\nMissing: {}\n\nPlace them under {} or set explicit paths in config.toml.",
+ missing.join(", "),
+ system_dir.display(),
+ ))
+}
+
+fn load_dsp_roms<const S: gecko::system::SystemId>(
+ emulator: &mut gecko::system::System<S>,
+ dsp_path: Option<&Path>,
+ coef_path: Option<&Path>,
+) {
+ if let Some(path) = dsp_path {
+ match std::fs::read(path) {
+ Ok(data) => emulator.dsp.load_irom(&data),
+ Err(err) => tracing::warn!(?err, path = %path.display(), "failed to load DSP IROM"),
+ }
+ }
+
+ if let Some(path) = coef_path {
+ match std::fs::read(path) {
+ Ok(data) => emulator.dsp.load_coef(&data),
+ Err(err) => tracing::warn!(?err, path = %path.display(), "failed to load DSP coef ROM"),
+ }
+ }
+}
+
+fn install_audio_sink<const S: gecko::system::SystemId>(
+ emulator: &mut gecko::system::System<S>,
+) -> Option<cpal::Stream> {
+ let emulated_rate = emulator.ai.control.aid_sample_rate_hz();
+ match audio::open(emulated_rate) {
+ Ok(backend) => {
+ emulator.audio_sink = Box::new(backend.sink);
+ Some(backend.stream)
+ }
+ Err(err) => {
+ tracing::warn!(?err, "failed to open CPAL output; running silent");
+ emulator.audio_sink = Box::new(EmptyAudioSink);
+ None
+ }
+ }
+}
diff --git a/crates/app/src/player/widget.rs b/crates/app/src/player/widget.rs
new file mode 100644
index 0000000..2f2313d
--- /dev/null
+++ b/crates/app/src/player/widget.rs
@@ -0,0 +1,137 @@
+use std::sync::Arc;
+
+use iced::advanced::graphics::Viewport;
+use iced::widget::shader::{self, Pipeline, Primitive, Program, Shader};
+use iced::{Rectangle, mouse};
+
+use crate::app::Message;
+use crate::player::state::{self, PlayerState};
+
+pub fn shader_widget(state: Arc<PlayerState>) -> Shader<Message, PlayerProgram> {
+ Shader::new(PlayerProgram { state })
+ .width(iced::Length::Fill)
+ .height(iced::Length::Fill)
+}
+
+pub struct PlayerProgram {
+ state: Arc<PlayerState>,
+}
+
+impl Program<Message> for PlayerProgram {
+ type State = ();
+ type Primitive = PlayerPrimitive;
+
+ fn draw(&self, _state: &Self::State, _cursor: mouse::Cursor, _bounds: Rectangle) -> Self::Primitive {
+ PlayerPrimitive {
+ state: self.state.clone(),
+ }
+ }
+
+ fn update(
+ &self,
+ _state: &mut Self::State,
+ event: &iced::Event,
+ bounds: Rectangle,
+ cursor: mouse::Cursor,
+ ) -> Option<shader::Action<Message>> {
+ match event {
+ iced::Event::Keyboard(kbd) => match kbd {
+ iced::keyboard::Event::KeyPressed { physical_key, .. } => {
+ if let Some(code) = state::physical_to_code(physical_key) {
+ self.state.handle_keyboard(code, true);
+ }
+ Some(shader::Action::request_redraw())
+ }
+ iced::keyboard::Event::KeyReleased { physical_key, .. } => {
+ if let Some(code) = state::physical_to_code(physical_key) {
+ self.state.handle_keyboard(code, false);
+ }
+ Some(shader::Action::request_redraw())
+ }
+ _ => None,
+ },
+ iced::Event::Mouse(ev) => match ev {
+ iced::mouse::Event::CursorMoved { .. } => {
+ if let Some(p) = cursor.position_in(bounds) {
+ let nx = p.x / bounds.width.max(1.0);
+ let ny = p.y / bounds.height.max(1.0);
+ self.state.set_ir_pointer(nx, ny);
+ } else {
+ self.state.clear_ir_pointer();
+ }
+ Some(shader::Action::request_redraw())
+ }
+ iced::mouse::Event::CursorLeft => {
+ self.state.clear_ir_pointer();
+ Some(shader::Action::request_redraw())
+ }
+ iced::mouse::Event::ButtonPressed(button) => {
+ if cursor.is_over(bounds) {
+ self.state.handle_mouse_button(*button, true);
+ }
+ Some(shader::Action::request_redraw())
+ }
+ iced::mouse::Event::ButtonReleased(button) => {
+ self.state.handle_mouse_button(*button, false);
+ Some(shader::Action::request_redraw())
+ }
+ _ => None,
+ },
+ _ => None,
+ }
+ }
+
+ fn mouse_interaction(&self, _state: &Self::State, bounds: Rectangle, cursor: mouse::Cursor) -> mouse::Interaction {
+ if cursor.is_over(bounds) {
+ mouse::Interaction::Hidden
+ } else {
+ mouse::Interaction::None
+ }
+ }
+}
+
+#[derive(Debug)]
+pub struct PlayerPrimitive {
+ state: Arc<PlayerState>,
+}
+
+impl Primitive for PlayerPrimitive {
+ type Pipeline = PlayerPipeline;
+
+ fn prepare(
+ &self,
+ pipeline: &mut Self::Pipeline,
+ device: &wgpu::Device,
+ queue: &wgpu::Queue,
+ _bounds: &Rectangle,
+ _viewport: &Viewport,
+ ) {
+ PlayerState::start_boot(&self.state, device, queue, pipeline.format);
+ }
+
+ fn render(
+ &self,
+ _pipeline: &Self::Pipeline,
+ encoder: &mut wgpu::CommandEncoder,
+ target: &wgpu::TextureView,
+ clip_bounds: &Rectangle<u32>,
+ ) {
+ self.state.blit(
+ encoder,
+ target,
+ (clip_bounds.width.max(1), clip_bounds.height.max(1)),
+ wgpu::LoadOp::Load,
+ );
+ }
+}
+
+#[derive(Debug)]
+pub struct PlayerPipeline {
+ format: wgpu::TextureFormat,
+}
+
+impl Pipeline for PlayerPipeline {
+ fn new(_device: &wgpu::Device, _queue: &wgpu::Queue, format: wgpu::TextureFormat) -> Self {
+ Self { format }
+ }
+}
diff --git a/crates/app/src/theme.rs b/crates/app/src/theme.rs
index 8fac2fc..c58af7d 100644
--- a/crates/app/src/theme.rs
+++ b/crates/app/src/theme.rs
@@ -64,7 +64,7 @@ pub fn theme(palette: &Palette) -> Theme {
let name = if palette.is_dark { "Gecko Dark" } else { "Gecko Light" };
Theme::custom(
name.to_owned(),
- iced::theme::Palette {
+ iced::theme::palette::Seed {
background: palette.bg,
text: palette.text,
primary: palette.accent,
diff --git a/crates/app/src/widgets/menubar.rs b/crates/app/src/widgets/menubar.rs
index 4fc97d5..c66120e 100644
--- a/crates/app/src/widgets/menubar.rs
+++ b/crates/app/src/widgets/menubar.rs
@@ -6,17 +6,21 @@ use crate::app::Message;
use crate::game::{CpuMode, Platform, ThemePreference};
use crate::theme::Palette;
-pub fn menubar(palette: &Palette, cpu: CpuMode, theme_pref: ThemePreference) -> Element<'static, Message> {
+pub fn menubar(
+ palette: &Palette,
+ cpu: CpuMode,
+ theme_pref: ThemePreference,
+ skip_ipl: bool,
+) -> Element<'static, Message> {
let bar_bg = palette.bg_2;
let border = palette.border;
let border_2 = palette.border_2;
let surface = palette.surface;
- let surface_2 = palette.surface_2;
let bar = MenuBar::new(vec![
Item::with_menu(self::top_label(palette, "File"), self::file_menu(palette)),
Item::with_menu(
self::top_label(palette, "Settings"),
- self::settings_menu(palette, cpu, theme_pref),
+ self::settings_menu(palette, cpu, theme_pref, skip_ipl),
),
Item::with_menu(self::top_label(palette, "About"), self::about_menu(palette)),
])
@@ -36,7 +40,7 @@ pub fn menubar(palette: &Palette, cpu: CpuMode, theme_pref: ThemePreference) ->
radius: 8.0.into(),
},
menu_shadow: iced::Shadow::default(),
- path: Background::Color(surface_2),
+ path: Background::Color(surface),
path_border: Border {
radius: 0.0.into(),
..Border::default()
@@ -75,6 +79,7 @@ fn top_label(palette: &Palette, label: &'static str) -> Element<'static, Message
bottom: 6.0,
left: 11.0,
})
+ .on_press(Message::Noop)
.style(move |_, status| self::top_button_style(status, hover, text_color))
.into()
}
@@ -194,6 +199,7 @@ fn settings_menu(
palette: &Palette,
cpu: CpuMode,
theme_pref: ThemePreference,
+ skip_ipl: bool,
) -> Menu<'static, Message, iced::Theme, iced::Renderer> {
Menu::new(vec![
Item::new(self::section_header(palette, "Execution Engine")),
@@ -210,6 +216,14 @@ fn settings_menu(
Some(cpu == CpuMode::Interpreter),
)),
Item::new(self::separator(palette)),
+ Item::new(self::section_header(palette, "Boot")),
+ Item::new(self::menu_item(
+ palette,
+ "Skip IPL (GameCube)",
+ Message::MenuToggleSkipIpl,
+ Some(skip_ipl),
+ )),
+ Item::new(self::separator(palette)),
Item::new(self::section_header(palette, "Theme")),
Item::new(self::menu_item(
palette,
diff --git a/crates/backend-wgpu/Cargo.toml b/crates/backend-wgpu/Cargo.toml
index 6c4a841..7143b02 100644
--- a/crates/backend-wgpu/Cargo.toml
+++ b/crates/backend-wgpu/Cargo.toml
@@ -8,7 +8,7 @@ renderdoc-capture = ["dep:renderdoc"]
hotpath = ["dep:hotpath", "hotpath/hotpath", "hotpath/crossbeam"]
[dependencies]
-wgpu = "28.0.0"
+wgpu = "29.0.3"
bytemuck = { version = "1.25.0", features = ["derive"] }
gecko = { path = "../gecko", default-features = false }
chapa = "0.1.2"
diff --git a/crates/backend-wgpu/src/clear.rs b/crates/backend-wgpu/src/clear.rs
index d4779b0..d411683 100644
--- a/crates/backend-wgpu/src/clear.rs
+++ b/crates/backend-wgpu/src/clear.rs
@@ -66,8 +66,8 @@ fn create_clear_pipeline(
},
depth_stencil: Some(wgpu::DepthStencilState {
format: depth_format,
- depth_write_enabled,
- depth_compare: wgpu::CompareFunction::Always,
+ depth_write_enabled: Some(depth_write_enabled),
+ depth_compare: Some(wgpu::CompareFunction::Always),
stencil: wgpu::StencilState::default(),
bias: wgpu::DepthBiasState::default(),
}),
@@ -109,7 +109,7 @@ impl EfbClear {
let layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
label: Some("efb_clear_layout"),
- bind_group_layouts: &[&bind_group_layout],
+ bind_group_layouts: &[Some(&bind_group_layout)],
immediate_size: 0,
});
diff --git a/crates/backend-wgpu/src/lib.rs b/crates/backend-wgpu/src/lib.rs
index 4ca3b73..251e9d6 100644
--- a/crates/backend-wgpu/src/lib.rs
+++ b/crates/backend-wgpu/src/lib.rs
@@ -366,7 +366,7 @@ impl GxRenderer {
let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
label: Some("gx_pipeline_layout"),
- bind_group_layouts: &[&bind_group_layout],
+ bind_group_layouts: &[Some(&bind_group_layout)],
immediate_size: 0,
});
@@ -548,7 +548,7 @@ impl GxRenderer {
let xfb_copy_pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
label: Some("xfb_copy_layout"),
- bind_group_layouts: &[&xfb_copy_bind_group_layout],
+ bind_group_layouts: &[Some(&xfb_copy_bind_group_layout)],
immediate_size: 0,
});
let xfb_copy_pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
@@ -629,7 +629,7 @@ impl GxRenderer {
});
let efb_depth_resolve_pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
label: Some("efb_depth_pack_layout"),
- bind_group_layouts: &[&efb_depth_resolve_bg_layout],
+ bind_group_layouts: &[Some(&efb_depth_resolve_bg_layout)],
immediate_size: 0,
});
let efb_depth_resolve_uniform_buffer = device.create_buffer(&wgpu::BufferDescriptor {
@@ -1004,30 +1004,45 @@ impl GxRenderer {
let t0 = std::time::Instant::now();
- let num_threads = std::thread::available_parallelism()
- .map(|n| n.get())
- .unwrap_or(4)
- .min(keys.len());
- let chunk_size = keys.len().div_ceil(num_threads);
-
- let self_ref = &*self;
- let compiled: Vec<(pipeline::FullPipelineKey, wgpu::RenderPipeline)> = std::thread::scope(|s| {
- let handles: Vec<_> = keys
- .chunks(chunk_size)
- .map(|chunk| {
- s.spawn(move || {
- chunk
- .iter()
- .map(|&k| {
- let module = &self_ref.shader_cache[&k.shader];
- (k, self_ref.create_pipeline(device, module, &k))
- })
- .collect::<Vec<_>>()
+ // wgpu 29's WebGPU backend wraps JS handles in Rc<Cell<_>>, making
+ // Device/Queue !Send — so the threaded compile path can't even
+ // type-check on wasm32. Fall back to a sequential pass there.
+ #[cfg(not(target_arch = "wasm32"))]
+ let compiled: Vec<(pipeline::FullPipelineKey, wgpu::RenderPipeline)> = {
+ let num_threads = std::thread::available_parallelism()
+ .map(|n| n.get())
+ .unwrap_or(4)
+ .min(keys.len());
+ let chunk_size = keys.len().div_ceil(num_threads);
+
+ let self_ref = &*self;
+ std::thread::scope(|s| {
+ let handles: Vec<_> = keys
+ .chunks(chunk_size)
+ .map(|chunk| {
+ s.spawn(move || {
+ chunk
+ .iter()
+ .map(|&k| {
+ let module = &self_ref.shader_cache[&k.shader];
+ (k, self_ref.create_pipeline(device, module, &k))
+ })
+ .collect::<Vec<_>>()
+ })
})
- })
- .collect();
- handles.into_iter().flat_map(|h| h.join().unwrap()).collect()
- });
+ .collect();
+ handles.into_iter().flat_map(|h| h.join().unwrap()).collect()
+ })
+ };
+
+ #[cfg(target_arch = "wasm32")]
+ let compiled: Vec<(pipeline::FullPipelineKey, wgpu::RenderPipeline)> = keys
+ .iter()
+ .map(|&k| {
+ let module = &self.shader_cache[&k.shader];
+ (k, self.create_pipeline(device, module, &k))
+ })
+ .collect();
for (k, p) in compiled {
self.pipeline_cache.insert(k, p);
diff --git a/crates/backend-wgpu/src/pipeline.rs b/crates/backend-wgpu/src/pipeline.rs
index bb054f4..3773f03 100644
--- a/crates/backend-wgpu/src/pipeline.rs
+++ b/crates/backend-wgpu/src/pipeline.rs
@@ -270,16 +270,16 @@ impl GxRenderer {
let depth_stencil = if key.z_enable {
Some(wgpu::DepthStencilState {
format: wgpu::TextureFormat::Depth24Plus,
- depth_write_enabled: key.z_write,
- depth_compare: helpers::map_compare_func(key.z_func),
+ depth_write_enabled: Some(key.z_write),
+ depth_compare: Some(helpers::map_compare_func(key.z_func)),
stencil: wgpu::StencilState::default(),
bias: wgpu::DepthBiasState::default(),
})
} else {
Some(wgpu::DepthStencilState {
format: wgpu::TextureFormat::Depth24Plus,
- depth_write_enabled: false,
- depth_compare: wgpu::CompareFunction::Always,
+ depth_write_enabled: Some(false),
+ depth_compare: Some(wgpu::CompareFunction::Always),
stencil: wgpu::StencilState::default(),
bias: wgpu::DepthBiasState::default(),
})
diff --git a/crates/backend-wgpu/src/render.rs b/crates/backend-wgpu/src/render.rs
index 3b5d108..fe55cb5 100644
--- a/crates/backend-wgpu/src/render.rs
+++ b/crates/backend-wgpu/src/render.rs
@@ -102,8 +102,10 @@ impl GxRenderer {
let draw_off = layout.draw_offset as usize;
let vertex_off = layout.vertex_offset as usize;
let index_off = layout.index_offset as usize;
- view[frame_off..frame_off + frame_uniform_bytes.len()].copy_from_slice(frame_uniform_bytes);
- view[draw_off..draw_off + self.scratch_uniform_bytes.len()].copy_from_slice(&self.scratch_uniform_bytes);
+ view.slice(frame_off..frame_off + frame_uniform_bytes.len())
+ .copy_from_slice(frame_uniform_bytes);
+ view.slice(draw_off..draw_off + self.scratch_uniform_bytes.len())
+ .copy_from_slice(&self.scratch_uniform_bytes);
for draw in &self.scratch_draws {
let stride = draw.packed_vertex_stride as usize;
@@ -114,9 +116,9 @@ impl GxRenderer {
for src_v in &self.scratch_vertices[src_base..src_end] {
let src_bytes = bytemuck::bytes_of(src_v);
- view[cursor..cursor + 68].copy_from_slice(&src_bytes[..68]);
+ view.slice(cursor..cursor + 68).copy_from_slice(&src_bytes[..68]);
if texcoord_bytes > 0 {
- view[cursor + 68..cursor + 68 + texcoord_bytes]
+ view.slice(cursor + 68..cursor + 68 + texcoord_bytes)
.copy_from_slice(&src_bytes[68..68 + texcoord_bytes]);
}
@@ -125,7 +127,7 @@ impl GxRenderer {
}
if !self.scratch_indices.is_empty() {
- view[index_off..index_off + index_used as usize]
+ view.slice(index_off..index_off + index_used as usize)
.copy_from_slice(bytemuck::cast_slice(&self.scratch_indices));
}
}
diff --git a/crates/backend-wgpu/src/sink.rs b/crates/backend-wgpu/src/sink.rs
index 57c7ac8..1ecf5b6 100644
--- a/crates/backend-wgpu/src/sink.rs
+++ b/crates/backend-wgpu/src/sink.rs
@@ -1,16 +1,25 @@
-use crate::GxRenderer;
+use gecko::host::GxAction;
-use gecko::host::{DrawData, DrawVertex, GxAction, RenderSink};
+#[cfg(not(target_arch = "wasm32"))]
+use crate::GxRenderer;
+#[cfg(not(target_arch = "wasm32"))]
+use gecko::host::{DrawData, DrawVertex, RenderSink};
+#[cfg(not(target_arch = "wasm32"))]
use std::sync::{Arc, Mutex, OnceLock};
+#[cfg(not(target_arch = "wasm32"))]
use std::thread::JoinHandle;
+#[cfg(not(target_arch = "wasm32"))]
use std::time::Instant;
+#[cfg(not(target_arch = "wasm32"))]
pub type FrameReadyCallback = Box<dyn Fn(Instant) + Send + Sync>;
+#[cfg(not(target_arch = "wasm32"))]
const WORK_QUEUE_LIMIT: usize = 4096;
/// Holds the XFB output texture view that the render worker updates and the
/// windowing thread reads for blitting.
+#[cfg(not(target_arch = "wasm32"))]
pub struct Shared {
pub output: Mutex<wgpu::TextureView>,
}
@@ -24,6 +33,7 @@ pub enum TargetAspect {
Ratio(f32),
}
+#[cfg(not(target_arch = "wasm32"))]
pub struct ThreadedSink {
work_tx: crossbeam_channel::Sender<WorkerCommand>,
recycled_draw_data_rx: crossbeam_channel::Receiver<Box<DrawData>>,
@@ -32,6 +42,7 @@ pub struct ThreadedSink {
scratch_sent_len: usize,
}
+#[cfg(not(target_arch = "wasm32"))]
struct RenderWorker {
gx: GxRenderer,
device: wgpu::Device,
@@ -41,11 +52,13 @@ struct RenderWorker {
recycled_draw_data_tx: crossbeam_channel::Sender<Box<DrawData>>,
}
+#[cfg(not(target_arch = "wasm32"))]
struct ActionMessage {
action: GxAction,
vertices: Vec<DrawVertex>,
}
+#[cfg(not(target_arch = "wasm32"))]
struct EfbDrainRequest {
mem1_addr: usize,
mem1_len: usize,
@@ -54,12 +67,14 @@ struct EfbDrainRequest {
done_tx: crossbeam_channel::Sender<()>,
}
+#[cfg(not(target_arch = "wasm32"))]
enum WorkerCommand {
Action(ActionMessage),
DrainEfbCopies(EfbDrainRequest),
Shutdown,
}
+#[cfg(not(target_arch = "wasm32"))]
impl RenderWorker {
fn run(mut self, work_rx: crossbeam_channel::Receiver<WorkerCommand>) {
while let Ok(command) = work_rx.recv() {
@@ -122,6 +137,7 @@ impl RenderWorker {
}
}
+#[cfg(not(target_arch = "wasm32"))]
impl ThreadedSink {
fn pending_vertices(&mut self) -> Vec<DrawVertex> {
if self.scratch.len() <= self.scratch_sent_len {
@@ -134,6 +150,7 @@ impl ThreadedSink {
}
}
+#[cfg(not(target_arch = "wasm32"))]
impl RenderSink for ThreadedSink {
fn exec(&mut self, action: GxAction) {
let resets_scratch = action_resets_vertex_scratch(&action);
@@ -177,6 +194,7 @@ impl RenderSink for ThreadedSink {
}
}
+#[cfg(not(target_arch = "wasm32"))]
impl Drop for ThreadedSink {
fn drop(&mut self) {
if let Some(worker_thread) = self.worker_thread.take() {
@@ -188,7 +206,7 @@ impl Drop for ThreadedSink {
}
}
-fn action_resets_vertex_scratch(action: &GxAction) -> bool {
+pub fn action_resets_vertex_scratch(action: &GxAction) -> bool {
match action {
GxAction::InvalidateCaches
| GxAction::CopyXfb { .. }
@@ -200,6 +218,7 @@ fn action_resets_vertex_scratch(action: &GxAction) -> bool {
}
}
+#[cfg(not(target_arch = "wasm32"))]
#[derive(Clone)]
pub struct Renderer {
shared: Arc<Shared>,
@@ -213,6 +232,7 @@ pub struct Renderer {
renderdoc: Arc<Mutex<crate::renderdoc_capture::RenderDocCapture>>,
}
+#[cfg(not(target_arch = "wasm32"))]
impl Renderer {
pub fn new(
device: wgpu::Device,
@@ -256,7 +276,7 @@ impl Renderer {
});
let blit_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
label: Some("blit_layout"),
- bind_group_layouts: &[&blit_bind_group_layout],
+ bind_group_layouts: &[Some(&blit_bind_group_layout)],
immediate_size: 0,
});
let blit_pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
@@ -392,6 +412,28 @@ impl Renderer {
/// XFB to `self.target_aspect`. Called by the windowing thread on each
/// redraw.
pub fn blit(&self, queue: &wgpu::Queue, target: &wgpu::TextureView, target_size: (u32, u32)) {
+ let mut encoder = self.device.create_command_encoder(&wgpu::CommandEncoderDescriptor {
+ label: Some("xfb_blit_encoder"),
+ });
+ self.blit_into_encoder(
+ &mut encoder,
+ target,
+ target_size,
+ wgpu::LoadOp::Clear(wgpu::Color::BLACK),
+ );
+ queue.submit([encoder.finish()]);
+ }
+
+ /// `blit` variant that writes into a caller-owned encoder, so the blit can
+ /// land inside someone else's frame command buffer (e.g. iced's shader
+ /// widget) instead of being submitted on its own.
+ pub fn blit_into_encoder(
+ &self,
+ encoder: &mut wgpu::CommandEncoder,
+ target: &wgpu::TextureView,
+ target_size: (u32, u32),
+ load: wgpu::LoadOp<wgpu::Color>,
+ ) {
let output = self.shared.output.lock().unwrap();
let bind_group = self.device.create_bind_group(&wgpu::BindGroupDescriptor {
label: Some("blit_bg"),
@@ -409,9 +451,6 @@ impl Renderer {
});
drop(output);
- let mut encoder = self.device.create_command_encoder(&wgpu::CommandEncoderDescriptor {
- label: Some("xfb_blit_encoder"),
- });
encoder.push_debug_group("XFB Blit To Surface");
{
let mut rpass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
@@ -420,7 +459,7 @@ impl Renderer {
view: target,
resolve_target: None,
ops: wgpu::Operations {
- load: wgpu::LoadOp::Clear(wgpu::Color::BLACK),
+ load,
store: wgpu::StoreOp::Store,
},
depth_slice: None,
@@ -438,7 +477,6 @@ impl Renderer {
rpass.draw(0..3, 0..1);
}
encoder.pop_debug_group();
- queue.submit([encoder.finish()]);
}
}
diff --git a/crates/dbglib/Cargo.toml b/crates/dbglib/Cargo.toml
index 943b819..c66633a 100644
--- a/crates/dbglib/Cargo.toml
+++ b/crates/dbglib/Cargo.toml
@@ -7,5 +7,5 @@ edition = "2024"
gecko = { path = "../gecko", default-features = false }
disasm = { path = "../disasm" }
image = { path = "../image", default-features = false }
-egui = "0.33.3"
-egui-phosphor = "0.11.0"
+egui = "0.34.2"
+egui-phosphor = "0.12.0"
diff --git a/crates/debugger/Cargo.toml b/crates/debugger/Cargo.toml
index 51b59f8..c438635 100644
--- a/crates/debugger/Cargo.toml
+++ b/crates/debugger/Cargo.toml
@@ -15,12 +15,12 @@ dbglib = { path = "../dbglib" }
backend-wgpu = { path = "../backend-wgpu" }
crossbeam-channel = "0.5.15"
ctrlc = "3.5.2"
-wgpu = "28.0.0"
+wgpu = "29.0.3"
winit = "0.30.13"
pollster = "0.4.0"
-egui = "0.33.3"
-egui-wgpu = "0.33.3"
-egui-winit = { version = "0.33.3", features = ["wayland", "x11"] }
-egui-phosphor = { version = "0.11.0", features = ["fill"] }
+egui = "0.34.2"
+egui-wgpu = "0.34.2"
+egui-winit = { version = "0.34.2", features = ["wayland", "x11"] }
+egui-phosphor = { version = "0.12.0", features = ["fill"] }
tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }
clap = { version = "4.6.0", features = ["derive"] }
diff --git a/crates/debugger/src/main.rs b/crates/debugger/src/main.rs
index 14d2cdb..ad4fdf8 100644
--- a/crates/debugger/src/main.rs
+++ b/crates/debugger/src/main.rs
@@ -450,7 +450,7 @@ fn main() {
} else if let Some(ref dvd_path) = args.dvd {
let dvd_data = std::fs::read(dvd_path).expect("failed to read DVD");
let dvd = image::load_dvd(dvd_data);
- game_id = Some(game_id_from_header(dvd.header()));
+ game_id = Some(dvd.header().game_id());
if dvd.header().is_wii() {
eprintln!("Detected Wii disc, booting via apploader HLE");
EmulatorVariant::Wii(Wii::apploader_hle(dvd).build())
@@ -493,9 +493,9 @@ fn main() {
emulator.install_audio_sink(Box::new(WavAudioSink::create("dump.wav", emulated_rate)));
// Create wgpu resources before the event loop (adapter without a surface).
- let instance = wgpu::Instance::new(&wgpu::InstanceDescriptor {
+ let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
backends: wgpu::Backends::all(),
- ..Default::default()
+ ..wgpu::InstanceDescriptor::new_without_display_handle()
});
let adapter = pollster::block_on(instance.request_adapter(&wgpu::RequestAdapterOptions {
@@ -576,20 +576,6 @@ fn main() {
std::mem::forget(app);
}
-fn game_id_from_header(header: &image::dvd::Header) -> String {
- let mut buf = String::with_capacity(6);
-
- for &b in &header.game_code {
- buf.push(if b.is_ascii_graphic() { b as char } else { '_' });
- }
-
- for &b in &header.maker_code {
- buf.push(if b.is_ascii_graphic() { b as char } else { '_' });
- }
-
- buf
-}
-
#[inline(always)]
fn set_bit<T: std::ops::BitOrAssign + std::ops::BitAndAssign + std::ops::Not<Output = T> + Copy>(
bits: &mut T,
diff --git a/crates/debugger/src/render.rs b/crates/debugger/src/render.rs
index 40f9a5b..6b23f82 100644
--- a/crates/debugger/src/render.rs
+++ b/crates/debugger/src/render.rs
@@ -113,9 +113,9 @@ impl RenderState {
debugger_ui.debugger.tick(emulator);
let frame = match self.surface.get_current_texture() {
- Ok(f) => f,
- Err(e) => {
- eprintln!("surface error: {e}");
+ wgpu::CurrentSurfaceTexture::Success(f) | wgpu::CurrentSurfaceTexture::Suboptimal(f) => f,
+ status => {
+ eprintln!("surface error: {status:?}");
#[cfg(feature = "renderdoc-capture")]
self.renderer.end_renderdoc_emulated_frame();
return;
diff --git a/crates/image/src/dvd.rs b/crates/image/src/dvd.rs
index a763a8b..c82958e 100644
--- a/crates/image/src/dvd.rs
+++ b/crates/image/src/dvd.rs
@@ -64,6 +64,17 @@ impl Header {
pub fn is_ntsc(&self) -> bool {
matches!(self.game_code[3], b'E' | b'B' | b'N' | b'J' | b'W' | b'K' | b'Q' | b'T')
}
+
+ pub fn game_id(&self) -> String {
+ let mut buf = String::with_capacity(6);
+ for &b in &self.game_code {
+ buf.push(if b.is_ascii_graphic() { b as char } else { '_' });
+ }
+ for &b in &self.maker_code {
+ buf.push(if b.is_ascii_graphic() { b as char } else { '_' });
+ }
+ buf
+ }
}
#[repr(C, packed)]
diff --git a/crates/mcp/Cargo.toml b/crates/mcp/Cargo.toml
index a0aad36..50f8079 100644
--- a/crates/mcp/Cargo.toml
+++ b/crates/mcp/Cargo.toml
@@ -8,7 +8,7 @@ gecko = { path = "../gecko" }
image = { path = "../image" }
backend-wgpu = { path = "../backend-wgpu" }
disasm = { path = "../disasm" }
-wgpu = "28.0.0"
+wgpu = "29.0.3"
pollster = "0.4.0"
png = "0.18.1"
rmcp = { version = "1.6.0", features = [
diff --git a/crates/mcp/src/main.rs b/crates/mcp/src/main.rs
index 5cdcfba..81de508 100644
--- a/crates/mcp/src/main.rs
+++ b/crates/mcp/src/main.rs
@@ -75,9 +75,9 @@ fn main() -> Result<()> {
None => DEFAULT_COEF_ROM.to_vec(),
};
- let instance = wgpu::Instance::new(&wgpu::InstanceDescriptor {
+ let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
backends: wgpu::Backends::all(),
- ..Default::default()
+ ..wgpu::InstanceDescriptor::new_without_display_handle()
});
let adapter = pollster::block_on(instance.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::default(),
diff --git a/crates/screenshotter/Cargo.toml b/crates/screenshotter/Cargo.toml
index f0b1a53..6a3bef0 100644
--- a/crates/screenshotter/Cargo.toml
+++ b/crates/screenshotter/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2024"
gecko = { path = "../gecko" }
image = { path = "../image" }
backend-wgpu = { path = "../backend-wgpu" }
-wgpu = "28.0.0"
+wgpu = "29.0.3"
pollster = "0.4.0"
png = "0.18.1"
diff --git a/crates/screenshotter/src/bin/screenshotter-worker.rs b/crates/screenshotter/src/bin/screenshotter-worker.rs
index c74945f..dad3b45 100644
--- a/crates/screenshotter/src/bin/screenshotter-worker.rs
+++ b/crates/screenshotter/src/bin/screenshotter-worker.rs
@@ -68,9 +68,9 @@ fn main() {
.expect("worker requires a path to a single ISO/RVZ/ZIP"),
);
- let instance = wgpu::Instance::new(&wgpu::InstanceDescriptor {
+ let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
backends: wgpu::Backends::all(),
- ..Default::default()
+ ..wgpu::InstanceDescriptor::new_without_display_handle()
});
let adapter = pollster::block_on(instance.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::default(),
diff --git a/crates/tinyapp/Cargo.toml b/crates/tinyapp/Cargo.toml
index bb968de..f896449 100644
--- a/crates/tinyapp/Cargo.toml
+++ b/crates/tinyapp/Cargo.toml
@@ -23,12 +23,12 @@ gecko = { path = "../gecko" }
scripting = { path = "../scripting", optional = true }
image = { path = "../image" }
backend-wgpu = { path = "../backend-wgpu" }
-wgpu = "28.0.0"
+wgpu = "29.0.3"
winit = "0.30.13"
pollster = "0.4.0"
-egui = "0.33.3"
-egui-wgpu = "0.33.3"
-egui-winit = { version = "0.33.3", features = ["wayland", "x11"] }
+egui = "0.34.2"
+egui-wgpu = "0.34.2"
+egui-winit = { version = "0.34.2", features = ["wayland", "x11"] }
tracing = "0.1.44"
tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }
clap = { version = "4.6.0", features = ["derive"] }
diff --git a/crates/tinyapp/src/app.rs b/crates/tinyapp/src/app.rs
index 9f219b5..b6e478d 100644
--- a/crates/tinyapp/src/app.rs
+++ b/crates/tinyapp/src/app.rs
@@ -144,9 +144,9 @@ impl State {
}
let frame = match self.surface.get_current_texture() {
- Ok(f) => f,
- Err(e) => {
- tracing::error!(?e, "surface error");
+ wgpu::CurrentSurfaceTexture::Success(f) | wgpu::CurrentSurfaceTexture::Suboptimal(f) => f,
+ status => {
+ tracing::error!(?status, "surface error");
return;
}
};
diff --git a/crates/tinyapp/src/main.rs b/crates/tinyapp/src/main.rs
index 17fb11f..b1465ce 100644
--- a/crates/tinyapp/src/main.rs
+++ b/crates/tinyapp/src/main.rs
@@ -242,7 +242,7 @@ fn main() {
} else if let Some(ref dvd_path) = args.dvd {
let dvd_data = std::fs::read(dvd_path).expect("failed to read DVD");
let dvd = image::load_dvd(dvd_data);
- let game_id = self::game_id_from_header(dvd.header());
+ let game_id = dvd.header().game_id();
if dvd.header().is_wii() {
tracing::info!("Detected Wii disc, booting via apploader HLE");
let builder = Wii::apploader_hle(dvd);
@@ -267,20 +267,6 @@ fn main() {
}
}
-fn game_id_from_header(header: &image::dvd::Header) -> String {
- let mut buf = String::with_capacity(6);
-
- for &b in &header.game_code {
- buf.push(if b.is_ascii_graphic() { b as char } else { '_' });
- }
-
- for &b in &header.maker_code {
- buf.push(if b.is_ascii_graphic() { b as char } else { '_' });
- }
-
- buf
-}
-
fn configure<const SYSTEM: SystemId>(emulator: &mut System<SYSTEM>, args: &Args) {
if let Some(ref dsp_path) = args.dsp {
let dsp_data = std::fs::read(dsp_path).expect("failed to read DSP IROM");
@@ -332,9 +318,9 @@ fn run<const SYSTEM: SystemId>(
game_id: Option<String>,
) {
let target_aspect = resolve_aspect(&args.aspect, SYSTEM);
- let instance = wgpu::Instance::new(&wgpu::InstanceDescriptor {
+ let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
backends: wgpu::Backends::all(),
- ..Default::default()
+ ..wgpu::InstanceDescriptor::new_without_display_handle()
});
let adapter = pollster::block_on(instance.request_adapter(&wgpu::RequestAdapterOptions {
diff --git a/crates/tinybench/src/bin/wii_bench.rs b/crates/tinybench/src/bin/wii_bench.rs
index de5b667..f088c1d 100644
--- a/crates/tinybench/src/bin/wii_bench.rs
+++ b/crates/tinybench/src/bin/wii_bench.rs
@@ -28,17 +28,6 @@ struct Args {
no_jit_cache: bool,
}
-fn game_id_from_header(header: &image::dvd::Header) -> String {
- let mut buf = String::with_capacity(6);
- for &b in &header.game_code {
- buf.push(if b.is_ascii_graphic() { b as char } else { '_' });
- }
- for &b in &header.maker_code {
- buf.push(if b.is_ascii_graphic() { b as char } else { '_' });
- }
- buf
-}
-
fn main() {
let args = Args::parse();
@@ -46,7 +35,7 @@ fn main() {
let dvd = image::load_dvd(dvd_data);
assert!(dvd.header().is_wii(), "wii_bench requires a Wii disc");
- let game_id = game_id_from_header(dvd.header());
+ let game_id = dvd.header().game_id();
let mut emulator = Wii::apploader_hle(dvd).build();
diff --git a/crates/web/Cargo.lock b/crates/web/Cargo.lock
index 7767c56..b322d95 100644
--- a/crates/web/Cargo.lock
+++ b/crates/web/Cargo.lock
@@ -20,9 +20,12 @@ checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618"
[[package]]
name = "accesskit"
-version = "0.21.1"
+version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf203f9d3bd8f29f98833d1fbef628df18f759248a547e7e01cfbf63cda36a99"
+checksum = "5351dcebb14b579ccab05f288596b2ae097005be7ee50a7c3d4ca9d0d5a66f6a"
+dependencies = [
+ "uuid",
+]
[[package]]
name = "adler2"
@@ -179,7 +182,16 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
dependencies = [
- "bit-vec",
+ "bit-vec 0.8.0",
+]
+
+[[package]]
+name = "bit-set"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34ddef2995421ab6a5c779542c81ee77c115206f4ad9d5a8e05f4ff49716a3dd"
+dependencies = [
+ "bit-vec 0.9.1",
]
[[package]]
@@ -188,6 +200,12 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+[[package]]
+name = "bit-vec"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b71798fca2c1fe1086445a7258a4bc81e6e49dcd24c8d0dd9a1e57395b603f51"
+
[[package]]
name = "bitflags"
version = "1.3.2"
@@ -200,12 +218,6 @@ version = "2.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
-[[package]]
-name = "block"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-
[[package]]
name = "block-buffer"
version = "0.10.4"
@@ -224,6 +236,15 @@ dependencies = [
"objc2 0.5.2",
]
+[[package]]
+name = "block2"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
+dependencies = [
+ "objc2 0.6.4",
+]
+
[[package]]
name = "bumpalo"
version = "3.20.2"
@@ -343,9 +364,9 @@ checksum = "c8f3df7969c229e288b63158f9aabaaaff2aebbab70d642ba8ca7b10b6216581"
[[package]]
name = "codespan-reporting"
-version = "0.12.0"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81"
+checksum = "af491d569909a7e4dee0ad7db7f5341fef5c614d5b8ec8cf765732aba3cff681"
dependencies = [
"serde",
"termcolor",
@@ -433,7 +454,7 @@ checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
dependencies = [
"bitflags 1.3.2",
"core-foundation 0.9.4",
- "core-graphics-types 0.1.3",
+ "core-graphics-types",
"foreign-types",
"libc",
]
@@ -449,17 +470,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "core-graphics-types"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
-dependencies = [
- "bitflags 2.11.1",
- "core-foundation 0.10.1",
- "libc",
-]
-
[[package]]
name = "cpufeatures"
version = "0.2.17"
@@ -572,6 +582,16 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
+[[package]]
+name = "dispatch2"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
+dependencies = [
+ "bitflags 2.11.1",
+ "objc2 0.6.4",
+]
+
[[package]]
name = "displaydoc"
version = "0.2.5"
@@ -615,8 +635,9 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
[[package]]
name = "ecolor"
-version = "0.33.3"
-source = "git+https://github.com/ioncodes/egui.git#5aeebf13a9d68f49766273104fbde0a5ab6e38fc"
+version = "0.34.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55f6cc0cb3b84a21232c468db972ebcddd34decbf1ff02cdebffd807c13bbd81"
dependencies = [
"bytemuck",
"emath",
@@ -624,8 +645,9 @@ dependencies = [
[[package]]
name = "egui"
-version = "0.33.3"
-source = "git+https://github.com/ioncodes/egui.git#5aeebf13a9d68f49766273104fbde0a5ab6e38fc"
+version = "0.34.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cbe28ac1a9c0761319aafb9ad37737720cc49d99c13a4a6b990768fa01ffe67"
dependencies = [
"accesskit",
"ahash",
@@ -641,17 +663,18 @@ dependencies = [
[[package]]
name = "egui-phosphor"
-version = "0.11.0"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b2838620355debaeb7fa3cc331a1d8ab77e6387d40e65686fa468c229dbf63"
+checksum = "cb4e4b18e368ff336c8dd2102992e2631b118f29a2164b0d2be9d8889dcd367e"
dependencies = [
"egui",
]
[[package]]
name = "egui-wgpu"
-version = "0.33.3"
-source = "git+https://github.com/ioncodes/egui.git#5aeebf13a9d68f49766273104fbde0a5ab6e38fc"
+version = "0.34.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f311c0b9cdd8a38821ae6f245fbe6e1a3d7d157c77b7d22344f205b317232c8"
dependencies = [
"ahash",
"bytemuck",
@@ -667,14 +690,15 @@ dependencies = [
[[package]]
name = "egui-winit"
-version = "0.33.3"
-source = "git+https://github.com/ioncodes/egui.git#5aeebf13a9d68f49766273104fbde0a5ab6e38fc"
+version = "0.34.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8e97625c2fe0fadc8b92ec690fbf515e15e2efd67ca50e063ad3302ec8ee626"
dependencies = [
"egui",
"log",
- "objc2 0.5.2",
- "objc2-foundation 0.2.2",
- "objc2-ui-kit",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+ "objc2-ui-kit 0.3.2",
"profiling",
"raw-window-handle",
"web-time",
@@ -690,8 +714,9 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
[[package]]
name = "emath"
-version = "0.33.3"
-source = "git+https://github.com/ioncodes/egui.git#5aeebf13a9d68f49766273104fbde0a5ab6e38fc"
+version = "0.34.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a74fbbf7501c430b89df62d102b6bfa02162faaf3e155512c677c9d20f5708d1"
dependencies = [
"bytemuck",
]
@@ -707,8 +732,9 @@ dependencies = [
[[package]]
name = "epaint"
-version = "0.33.3"
-source = "git+https://github.com/ioncodes/egui.git#5aeebf13a9d68f49766273104fbde0a5ab6e38fc"
+version = "0.34.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92b452e348c2758115288802ca25f86ee286ce2cfae6643711ce116662311310"
dependencies = [
"ahash",
"bytemuck",
@@ -728,8 +754,9 @@ dependencies = [
[[package]]
name = "epaint_default_fonts"
-version = "0.33.3"
-source = "git+https://github.com/ioncodes/egui.git#5aeebf13a9d68f49766273104fbde0a5ab6e38fc"
+version = "0.34.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1644e25dbe3d663fd9c2a4181772c64b23361e377e550c10422ecc3a7de1c3c2"
[[package]]
name = "equivalent"
@@ -960,9 +987,9 @@ dependencies = [
[[package]]
name = "glow"
-version = "0.16.0"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08"
+checksum = "29038e1c483364cc6bb3cf78feee1816002e127c331a1eec55a4d202b9e1adb5"
dependencies = [
"js-sys",
"slotmap",
@@ -1170,6 +1197,7 @@ dependencies = [
name = "image"
version = "0.1.0"
dependencies = [
+ "tracing",
"zerocopy",
"zip",
]
@@ -1317,7 +1345,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba4ebbd48ce411c1d10fb35185f5a51a7bfa3d8b24b4e330d30c9e3a34129501"
dependencies = [
"ascii-canvas",
- "bit-set",
+ "bit-set 0.8.0",
"ena",
"itertools",
"lalrpop-util",
@@ -1518,15 +1546,6 @@ dependencies = [
"logos-codegen",
]
-[[package]]
-name = "malloc_buf"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "memchr"
version = "2.8.0"
@@ -1542,21 +1561,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "metal"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7047791b5bc903b8cd963014b355f71dc9864a9a0b727057676c1dcae5cbc15"
-dependencies = [
- "bitflags 2.11.1",
- "block",
- "core-graphics-types 0.2.0",
- "foreign-types",
- "log",
- "objc",
- "paste",
-]
-
[[package]]
name = "miniz_oxide"
version = "0.8.9"
@@ -1591,12 +1595,12 @@ dependencies = [
[[package]]
name = "naga"
-version = "28.0.0"
+version = "29.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "618f667225063219ddfc61251087db8a9aec3c3f0950c916b614e403486f1135"
+checksum = "0dd91265cc2454558f659b3b4b9640f0ddb8cc6521277f166b8a8c181c898079"
dependencies = [
"arrayvec",
- "bit-set",
+ "bit-set 0.9.1",
"bitflags 2.11.1",
"cfg-if",
"cfg_aliases",
@@ -1689,15 +1693,6 @@ dependencies = [
"syn",
]
-[[package]]
-name = "objc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-dependencies = [
- "malloc_buf",
-]
-
[[package]]
name = "objc-sys"
version = "0.3.5"
@@ -1730,13 +1725,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
dependencies = [
"bitflags 2.11.1",
- "block2",
+ "block2 0.5.1",
"libc",
"objc2 0.5.2",
"objc2-core-data",
"objc2-core-image",
"objc2-foundation 0.2.2",
- "objc2-quartz-core",
+ "objc2-quartz-core 0.2.2",
]
[[package]]
@@ -1746,7 +1741,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
dependencies = [
"bitflags 2.11.1",
- "block2",
+ "block2 0.5.1",
"objc2 0.5.2",
"objc2-core-location",
"objc2-foundation 0.2.2",
@@ -1758,7 +1753,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
dependencies = [
- "block2",
+ "block2 0.5.1",
"objc2 0.5.2",
"objc2-foundation 0.2.2",
]
@@ -1770,21 +1765,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
dependencies = [
"bitflags 2.11.1",
- "block2",
+ "block2 0.5.1",
"objc2 0.5.2",
"objc2-foundation 0.2.2",
]
+[[package]]
+name = "objc2-core-foundation"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
+dependencies = [
+ "bitflags 2.11.1",
+ "dispatch2",
+ "objc2 0.6.4",
+]
+
[[package]]
name = "objc2-core-image"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
dependencies = [
- "block2",
+ "block2 0.5.1",
"objc2 0.5.2",
"objc2-foundation 0.2.2",
- "objc2-metal",
+ "objc2-metal 0.2.2",
]
[[package]]
@@ -1793,7 +1799,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
dependencies = [
- "block2",
+ "block2 0.5.1",
"objc2 0.5.2",
"objc2-contacts",
"objc2-foundation 0.2.2",
@@ -1812,7 +1818,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
dependencies = [
"bitflags 2.11.1",
- "block2",
+ "block2 0.5.1",
"dispatch",
"libc",
"objc2 0.5.2",
@@ -1826,6 +1832,7 @@ checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
dependencies = [
"bitflags 2.11.1",
"objc2 0.6.4",
+ "objc2-core-foundation",
]
[[package]]
@@ -1834,7 +1841,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
dependencies = [
- "block2",
+ "block2 0.5.1",
"objc2 0.5.2",
"objc2-app-kit",
"objc2-foundation 0.2.2",
@@ -1847,11 +1854,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
dependencies = [
"bitflags 2.11.1",
- "block2",
+ "block2 0.5.1",
"objc2 0.5.2",
"objc2-foundation 0.2.2",
]
+[[package]]
+name = "objc2-metal"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0125f776a10d00af4152d74616409f0d4a2053a6f57fa5b7d6aa2854ac04794"
+dependencies = [
+ "bitflags 2.11.1",
+ "block2 0.6.2",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
[[package]]
name = "objc2-quartz-core"
version = "0.2.2"
@@ -1859,10 +1878,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
dependencies = [
"bitflags 2.11.1",
- "block2",
+ "block2 0.5.1",
"objc2 0.5.2",
"objc2-foundation 0.2.2",
- "objc2-metal",
+ "objc2-metal 0.2.2",
+]
+
+[[package]]
+name = "objc2-quartz-core"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
+dependencies = [
+ "bitflags 2.11.1",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+ "objc2-metal 0.3.2",
]
[[package]]
@@ -1882,7 +1914,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
dependencies = [
"bitflags 2.11.1",
- "block2",
+ "block2 0.5.1",
"objc2 0.5.2",
"objc2-cloud-kit",
"objc2-core-data",
@@ -1890,19 +1922,31 @@ dependencies = [
"objc2-core-location",
"objc2-foundation 0.2.2",
"objc2-link-presentation",
- "objc2-quartz-core",
+ "objc2-quartz-core 0.2.2",
"objc2-symbols",
"objc2-uniform-type-identifiers",
"objc2-user-notifications",
]
+[[package]]
+name = "objc2-ui-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
+dependencies = [
+ "bitflags 2.11.1",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+]
+
[[package]]
name = "objc2-uniform-type-identifiers"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
dependencies = [
- "block2",
+ "block2 0.5.1",
"objc2 0.5.2",
"objc2-foundation 0.2.2",
]
@@ -1914,7 +1958,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
dependencies = [
"bitflags 2.11.1",
- "block2",
+ "block2 0.5.1",
"objc2 0.5.2",
"objc2-core-location",
"objc2-foundation 0.2.2",
@@ -1977,12 +2021,6 @@ dependencies = [
"windows-link",
]
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
[[package]]
name = "peniko"
version = "0.6.0"
@@ -2220,6 +2258,18 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
+[[package]]
+name = "raw-window-metal"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40d213455a5f1dc59214213c7330e074ddf8114c9a42411eb890c767357ce135"
+dependencies = [
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+ "objc2-quartz-core 0.3.2",
+]
+
[[package]]
name = "read-fonts"
version = "0.37.0"
@@ -2532,9 +2582,9 @@ dependencies = [
[[package]]
name = "spirv"
-version = "0.3.0+sdk-1.3.268.0"
+version = "0.4.0+sdk-1.4.341.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
+checksum = "d9571ea910ebd84c86af4b3ed27f9dbdc6ad06f17c5f96146b2b671e2976744f"
dependencies = [
"bitflags 2.11.1",
]
@@ -2829,6 +2879,12 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+[[package]]
+name = "uuid"
+version = "1.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76"
+
[[package]]
name = "vello_common"
version = "0.0.6"
@@ -3132,9 +3188,9 @@ dependencies = [
[[package]]
name = "wgpu"
-version = "28.0.0"
+version = "29.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9cb534d5ffd109c7d1135f34cdae29e60eab94855a625dcfe1705f8bc7ad79f"
+checksum = "bb3feacc458f7bee8bc1737149b42b6c731aa461039a4264a67bb6681646b250"
dependencies = [
"arrayvec",
"bitflags 2.11.1",
@@ -3162,13 +3218,13 @@ dependencies = [
[[package]]
name = "wgpu-core"
-version = "28.0.1"
+version = "29.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d23f4642f53f666adcfd2d3218ab174d1e6681101aef18696b90cbe64d1c10f9"
+checksum = "02da3ad1b568337f25513b317870960ef87073ea0945502e44b864b67a8c77b7"
dependencies = [
"arrayvec",
- "bit-set",
- "bit-vec",
+ "bit-set 0.9.1",
+ "bit-vec 0.9.1",
"bitflags 2.11.1",
"bytemuck",
"cfg_aliases",
@@ -3187,54 +3243,64 @@ dependencies = [
"thiserror 2.0.18",
"wgpu-core-deps-apple",
"wgpu-core-deps-emscripten",
+ "wgpu-core-deps-wasm",
"wgpu-core-deps-windows-linux-android",
"wgpu-hal",
+ "wgpu-naga-bridge",
"wgpu-types",
]
[[package]]
name = "wgpu-core-deps-apple"
-version = "28.0.0"
+version = "29.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87b7b696b918f337c486bf93142454080a32a37832ba8a31e4f48221890047da"
+checksum = "62e51b5447e144b3dbba4feb01f80f4fa21696fa0cd99afb2c3df1affd6fdb28"
dependencies = [
"wgpu-hal",
]
[[package]]
name = "wgpu-core-deps-emscripten"
-version = "28.0.0"
+version = "29.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34b251c331f84feac147de3c4aa3aa45112622a95dd7ee1b74384fa0458dbd79"
+checksum = "3487cd6293a963bc5c0c0396f6a2192043c50003c07f4efdccbad3d90ec9d819"
+dependencies = [
+ "wgpu-hal",
+]
+
+[[package]]
+name = "wgpu-core-deps-wasm"
+version = "29.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c2f2fb042f36920771deb0b966543c5751b18f3d327760ffc90f74e20b2dcd4"
dependencies = [
"wgpu-hal",
]
[[package]]
name = "wgpu-core-deps-windows-linux-android"
-version = "28.0.0"
+version = "29.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68ca976e72b2c9964eb243e281f6ce7f14a514e409920920dcda12ae40febaae"
+checksum = "1bfb01076d0aa08b0ba9bd741e178b5cc440f5abe99d9581323a4c8b5d1a1916"
dependencies = [
"wgpu-hal",
]
[[package]]
name = "wgpu-hal"
-version = "28.0.1"
+version = "29.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d6cb474beb218824dcc9e1ce679d973f719262789bfb27407da560cac20eeb"
+checksum = "31f8e1a9e7a8512f276f7c62e018c7fa8d60954303fed2e5750114332049193f"
dependencies = [
"android_system_properties",
"arrayvec",
"ash",
- "bit-set",
+ "bit-set 0.9.1",
"bitflags 2.11.1",
- "block",
+ "block2 0.6.2",
"bytemuck",
"cfg-if",
"cfg_aliases",
- "core-graphics-types 0.2.0",
"glow",
"glutin_wgl_sys",
"gpu-allocator",
@@ -3245,10 +3311,13 @@ dependencies = [
"libc",
"libloading",
"log",
- "metal",
"naga",
"ndk-sys",
- "objc",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+ "objc2-metal 0.3.2",
+ "objc2-quartz-core 0.3.2",
"once_cell",
"ordered-float",
"parking_lot",
@@ -3257,26 +3326,41 @@ dependencies = [
"profiling",
"range-alloc",
"raw-window-handle",
+ "raw-window-metal",
"renderdoc-sys",
"smallvec",
"thiserror 2.0.18",
"wasm-bindgen",
+ "wayland-sys",
"web-sys",
+ "wgpu-naga-bridge",
"wgpu-types",
"windows",
"windows-core",
+ "windows-result",
+]
+
+[[package]]
+name = "wgpu-naga-bridge"
+version = "29.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59c654c483f058800972c3645e95388a7eca31bf9fe1933bc20e036588a0be02"
+dependencies = [
+ "naga",
+ "wgpu-types",
]
[[package]]
name = "wgpu-types"
-version = "28.0.0"
+version = "29.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e18308757e594ed2cd27dddbb16a139c42a683819d32a2e0b1b0167552f5840c"
+checksum = "a9bcc31518a0e9735aefebedb5f7a9ef3ed1c42549c9f4c882fa9060ceaac639"
dependencies = [
"bitflags 2.11.1",
"bytemuck",
"js-sys",
"log",
+ "raw-window-handle",
"web-sys",
]
@@ -3528,7 +3612,7 @@ dependencies = [
"android-activity",
"atomic-waker",
"bitflags 2.11.1",
- "block2",
+ "block2 0.5.1",
"bytemuck",
"calloop",
"cfg_aliases",
@@ -3544,7 +3628,7 @@ dependencies = [
"objc2 0.5.2",
"objc2-app-kit",
"objc2-foundation 0.2.2",
- "objc2-ui-kit",
+ "objc2-ui-kit 0.2.2",
"orbclient",
"percent-encoding",
"pin-project",
diff --git a/crates/web/Cargo.toml b/crates/web/Cargo.toml
index db20d7b..4d7d692 100644
--- a/crates/web/Cargo.toml
+++ b/crates/web/Cargo.toml
@@ -14,12 +14,12 @@ gecko = { path = "../gecko", default-features = false }
image = { path = "../image", default-features = false }
backend-wgpu = { path = "../backend-wgpu" }
dbglib = { path = "../dbglib", optional = true }
-egui-phosphor = { version = "0.11.0", optional = true, features = ["fill"] }
-wgpu = "28.0.0"
+egui-phosphor = { version = "0.12.0", optional = true, features = ["fill"] }
+wgpu = "29.0.3"
winit = { version = "0.30.13", features = ["rwh_06"] }
-egui = "0.33.3"
-egui-wgpu = "0.33.3"
-egui-winit = { version = "0.33.3", default-features = false, features = ["links"] }
+egui = "0.34.2"
+egui-wgpu = "0.34.2"
+egui-winit = { version = "0.34.2", default-features = false, features = ["links"] }
wasm-bindgen = "0.2.117"
wasm-bindgen-futures = "0.4.67"
web-sys = { version = "0.3.94", features = [
@@ -37,11 +37,3 @@ web-sys = { version = "0.3.94", features = [
] }
console_error_panic_hook = "0.1.7"
getrandom = { version = "0.3", features = ["wasm_js"] }
-
-[patch.crates-io]
-egui = { git = "https://github.com/ioncodes/egui.git" }
-epaint = { git = "https://github.com/ioncodes/egui.git" }
-emath = { git = "https://github.com/ioncodes/egui.git" }
-ecolor = { git = "https://github.com/ioncodes/egui.git" }
-egui-wgpu = { git = "https://github.com/ioncodes/egui.git" }
-egui-winit = { git = "https://github.com/ioncodes/egui.git" }
diff --git a/crates/web/src/lib.rs b/crates/web/src/lib.rs
index 656f7c7..70106b5 100644
--- a/crates/web/src/lib.rs
+++ b/crates/web/src/lib.rs
@@ -46,13 +46,23 @@ fn fs_main(in: VsOut) -> @location(0) vec4<f32> {
}
";
+/// One queued [`GxAction`] alongside the vertices appended to the sink's
+/// scratch buffer since the previous action. The main-thread drainer
+/// extends the renderer's `scratch_vertices` with `vertices` *before*
+/// processing `action`, so each draw's `base_vertex` indexes correctly
+/// even when an earlier action (e.g. `CopyXfb`) cleared the renderer's
+/// scratch mid-batch.
+struct ActionMessage {
+ action: GxAction,
+ vertices: Vec<DrawVertex>,
+}
+
/// Shared between [`WebSink`] (running on the emulator side) and the main
/// thread that drains the queue. The `epoch` is bumped each time the main
/// thread drains; the sink uses it to know when to reset its mirrored
/// vertex scratch.
struct WebSinkShared {
- actions: Vec<GxAction>,
- scratch: Vec<DrawVertex>,
+ messages: Vec<ActionMessage>,
epoch: u64,
}
@@ -61,10 +71,16 @@ type WebSinkQueue = Arc<Mutex<WebSinkShared>>;
/// RenderSink that queues actions for synchronous processing on the main thread.
struct WebSink {
shared: WebSinkQueue,
- /// Mirror of `shared.scratch`, written by the gecko side via
- /// [`RenderSink::vertex_scratch`]. Synced into `shared.scratch` on every
- /// `exec`. Cleared when the main thread bumps `shared.epoch`.
+ /// Vertex scratch handed to the gecko side via
+ /// [`RenderSink::vertex_scratch`]. Cleared when the main thread bumps
+ /// `shared.epoch` (frame boundary) and again on any action that resets
+ /// the renderer's scratch — keeping the gecko side's `base_vertex` in
+ /// step with the per-message deltas we ship to the drainer.
scratch: Vec<DrawVertex>,
+ /// How much of `scratch` has been shipped in a prior `exec` message.
+ /// New vertices appended past this index are the delta for the next
+ /// message.
+ scratch_sent_len: usize,
last_epoch: u64,
}
@@ -73,19 +89,29 @@ impl RenderSink for WebSink {
let mut s = self.shared.lock().unwrap();
if s.epoch != self.last_epoch {
self.scratch.clear();
+ self.scratch_sent_len = 0;
self.last_epoch = s.epoch;
}
- if self.scratch.len() > s.scratch.len() {
- let start = s.scratch.len();
- s.scratch.extend_from_slice(&self.scratch[start..]);
+ let vertices = if self.scratch.len() > self.scratch_sent_len {
+ self.scratch[self.scratch_sent_len..].to_vec()
+ } else {
+ Vec::new()
+ };
+ self.scratch_sent_len = self.scratch.len();
+ let resets = backend_wgpu::sink::action_resets_vertex_scratch(&action);
+ s.messages.push(ActionMessage { action, vertices });
+ drop(s);
+ if resets {
+ self.scratch.clear();
+ self.scratch_sent_len = 0;
}
- s.actions.push(action);
}
fn vertex_scratch(&mut self) -> &mut Vec<DrawVertex> {
let s = self.shared.lock().unwrap();
if s.epoch != self.last_epoch {
self.scratch.clear();
+ self.scratch_sent_len = 0;
self.last_epoch = s.epoch;
}
drop(s);
@@ -119,9 +145,9 @@ fn now_ms() -> f64 {
impl State {
async fn new(window: Arc<Window>) -> Self {
- let instance = wgpu::Instance::new(&wgpu::InstanceDescriptor {
+ let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
backends: wgpu::Backends::BROWSER_WEBGPU,
- ..Default::default()
+ ..wgpu::InstanceDescriptor::new_without_display_handle()
});
let surface = instance.create_surface(window.clone()).unwrap();
@@ -192,7 +218,7 @@ impl State {
});
let blit_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
label: None,
- bind_group_layouts: &[&blit_bind_group_layout],
+ bind_group_layouts: &[Some(&blit_bind_group_layout)],
immediate_size: 0,
});
let blit_pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
@@ -304,22 +330,31 @@ impl State {
#[cfg(not(feature = "debug"))]
emulator.run_until_vsync();
- // Drain queued GxActions and the matching vertex scratch.
- let (actions, scratch): (Vec<GxAction>, Vec<DrawVertex>) = {
+ // Drain queued action messages.
+ let messages: Vec<ActionMessage> = {
let mut s = action_queue.lock().unwrap();
s.epoch = s.epoch.wrapping_add(1);
- (std::mem::take(&mut s.actions), std::mem::take(&mut s.scratch))
+ std::mem::take(&mut s.messages)
};
- // Make the drained scratch the renderer's vertex buffer for this drain so
- // each `Draw` action's `base_vertex` indexes into it correctly.
- let _old = self.gx_renderer.replace_vertex_scratch(scratch);
- for action in &actions {
- self.gx_renderer.process_action(&self.device, &self.queue, action);
+ // Start the frame with an empty external scratch; each message
+ // contributes its vertex delta to it before its action runs, and
+ // actions that flush the renderer's scratch truncate the external
+ // one back to zero in lockstep.
+ let mut external_scratch = self.gx_renderer.replace_vertex_scratch(Vec::new());
+ external_scratch.clear();
+ for msg in messages {
+ external_scratch.extend_from_slice(&msg.vertices);
+ self.gx_renderer.process_action_with_external_scratch(
+ &self.device,
+ &self.queue,
+ &msg.action,
+ &mut external_scratch,
+ );
}
let frame = match self.surface.get_current_texture() {
- Ok(f) => f,
- Err(_) => return,
+ wgpu::CurrentSurfaceTexture::Success(f) | wgpu::CurrentSurfaceTexture::Suboptimal(f) => f,
+ _ => return,
};
let view = frame.texture.create_view(&Default::default());
@@ -538,13 +573,13 @@ pub fn start_emulator(rom_data: &[u8], filename: String, dsp_irom: Option<Vec<u8
// Install the WebSink as the emulator's render sink.
let action_queue: WebSinkQueue = Arc::new(Mutex::new(WebSinkShared {
- actions: Vec::new(),
- scratch: Vec::new(),
+ messages: Vec::new(),
epoch: 0,
}));
emulator.render_sink = Box::new(WebSink {
shared: action_queue.clone(),
scratch: Vec::new(),
+ scratch_sent_len: 0,
last_epoch: 0,
});
diff --git a/images/launcher.png b/images/launcher.png
new file mode 100644
index 0000000..9e1fd07
Binary files /dev/null and b/images/launcher.png differ