diff --git a/Cargo.lock b/Cargo.lock index b154fe8f27a7..e4733caf4424 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -863,7 +863,7 @@ checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", "core-foundation 0.9.4", - "core-graphics-types", + "core-graphics-types 0.1.3", "foreign-types", "libc", ] @@ -879,6 +879,17 @@ 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.9.4", + "core-foundation 0.10.1", + "libc", +] + [[package]] name = "core2" version = "0.4.0" @@ -1321,8 +1332,8 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76" [[package]] name = "ecolor" -version = "0.31.1" -source = "git+https://github.com/emilk/egui.git?branch=main#78a8de2e8f8d6da82680af4701cfa6e61cfe389c" +version = "0.32.3" +source = "git+https://github.com/emilk/egui.git?branch=main#e9898e49329c3364c78dff24a2ff02a2ab1ec3ff" dependencies = [ "bytemuck", "emath", @@ -1330,8 +1341,8 @@ dependencies = [ [[package]] name = "egui" -version = "0.31.1" -source = "git+https://github.com/emilk/egui.git?branch=main#78a8de2e8f8d6da82680af4701cfa6e61cfe389c" +version = "0.32.3" +source = "git+https://github.com/emilk/egui.git?branch=main#e9898e49329c3364c78dff24a2ff02a2ab1ec3ff" dependencies = [ "ahash", "bitflags 2.9.4", @@ -1346,8 +1357,8 @@ dependencies = [ [[package]] name = "egui-wgpu" -version = "0.31.1" -source = "git+https://github.com/emilk/egui.git?branch=main#78a8de2e8f8d6da82680af4701cfa6e61cfe389c" +version = "0.32.3" +source = "git+https://github.com/emilk/egui.git?branch=main#e9898e49329c3364c78dff24a2ff02a2ab1ec3ff" dependencies = [ "ahash", "bytemuck", @@ -1359,16 +1370,15 @@ dependencies = [ "thiserror 1.0.69", "type-map", "web-time", - "wgpu", + "wgpu 26.0.1", "winit", ] [[package]] name = "egui-winit" -version = "0.31.1" -source = "git+https://github.com/emilk/egui.git?branch=main#78a8de2e8f8d6da82680af4701cfa6e61cfe389c" +version = "0.32.3" +source = "git+https://github.com/emilk/egui.git?branch=main#e9898e49329c3364c78dff24a2ff02a2ab1ec3ff" dependencies = [ - "ahash", "arboard", "bytemuck", "egui", @@ -1383,8 +1393,8 @@ dependencies = [ [[package]] name = "egui_extras" -version = "0.31.1" -source = "git+https://github.com/emilk/egui.git?branch=main#78a8de2e8f8d6da82680af4701cfa6e61cfe389c" +version = "0.32.3" +source = "git+https://github.com/emilk/egui.git?branch=main#e9898e49329c3364c78dff24a2ff02a2ab1ec3ff" dependencies = [ "ahash", "egui", @@ -1402,8 +1412,8 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "emath" -version = "0.31.1" -source = "git+https://github.com/emilk/egui.git?branch=main#78a8de2e8f8d6da82680af4701cfa6e61cfe389c" +version = "0.32.3" +source = "git+https://github.com/emilk/egui.git?branch=main#e9898e49329c3364c78dff24a2ff02a2ab1ec3ff" dependencies = [ "bytemuck", ] @@ -1530,8 +1540,8 @@ dependencies = [ [[package]] name = "epaint" -version = "0.31.1" -source = "git+https://github.com/emilk/egui.git?branch=main#78a8de2e8f8d6da82680af4701cfa6e61cfe389c" +version = "0.32.3" +source = "git+https://github.com/emilk/egui.git?branch=main#e9898e49329c3364c78dff24a2ff02a2ab1ec3ff" dependencies = [ "ab_glyph", "ahash", @@ -1547,8 +1557,8 @@ dependencies = [ [[package]] name = "epaint_default_fonts" -version = "0.31.1" -source = "git+https://github.com/emilk/egui.git?branch=main#78a8de2e8f8d6da82680af4701cfa6e61cfe389c" +version = "0.32.3" +source = "git+https://github.com/emilk/egui.git?branch=main#e9898e49329c3364c78dff24a2ff02a2ab1ec3ff" [[package]] name = "equivalent" @@ -2108,7 +2118,7 @@ dependencies = [ "vec_map", "wasm-bindgen", "web-sys", - "windows 0.61.1", + "windows 0.54.0", ] [[package]] @@ -2226,7 +2236,7 @@ dependencies = [ "log", "presser", "thiserror 1.0.69", - "windows 0.58.0", + "windows 0.54.0", ] [[package]] @@ -3081,7 +3091,22 @@ checksum = "f569fb946490b5743ad69813cb19629130ce9374034abe31614a36402d18f99e" dependencies = [ "bitflags 2.9.4", "block", - "core-graphics-types", + "core-graphics-types 0.1.3", + "foreign-types", + "log", + "objc", + "paste", +] + +[[package]] +name = "metal" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00c15a6f673ff72ddcc22394663290f870fb224c1bfce55734a75c414150e605" +dependencies = [ + "bitflags 2.9.4", + "block", + "core-graphics-types 0.2.0", "foreign-types", "log", "objc", @@ -3167,13 +3192,39 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "naga" +version = "26.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "916cbc7cb27db60be930a4e2da243cf4bc39569195f22fd8ee419cd31d5b662c" +dependencies = [ + "arrayvec", + "bit-set", + "bitflags 2.9.4", + "cfg-if", + "cfg_aliases", + "codespan-reporting", + "half", + "hashbrown 0.15.3", + "hexf-parse", + "indexmap", + "libm", + "log", + "num-traits", + "once_cell", + "rustc-hash 1.1.0", + "spirv", + "thiserror 2.0.16", + "unicode-ident", +] + [[package]] name = "naga-agal" version = "0.1.0" dependencies = [ "bitflags 2.9.4", "insta", - "naga", + "naga 25.0.1", "num-derive", "num-traits", ] @@ -3183,7 +3234,7 @@ name = "naga-pixelbender" version = "0.1.0" dependencies = [ "anyhow", - "naga", + "naga 25.0.1", "ruffle_render", ] @@ -4560,7 +4611,7 @@ dependencies = [ "url", "vergen", "webbrowser", - "wgpu", + "wgpu 25.0.2", "windows-sys 0.61.0", "winit", ] @@ -4645,7 +4696,7 @@ dependencies = [ "thiserror 2.0.16", "tracing", "wasm-bindgen", - "wgpu", + "wgpu 25.0.2", ] [[package]] @@ -4688,7 +4739,7 @@ dependencies = [ "image", "indexmap", "lru", - "naga", + "naga 25.0.1", "naga-agal", "naga-pixelbender", "profiling", @@ -4697,7 +4748,7 @@ dependencies = [ "swf", "tracing", "web-sys", - "wgpu", + "wgpu 25.0.2", ] [[package]] @@ -6506,7 +6557,36 @@ dependencies = [ "hashbrown 0.15.3", "js-sys", "log", - "naga", + "naga 25.0.1", + "parking_lot", + "portable-atomic", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core 25.0.2", + "wgpu-hal 25.0.2", + "wgpu-types 25.0.0", +] + +[[package]] +name = "wgpu" +version = "26.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70b6ff82bbf6e9206828e1a3178e851f8c20f1c9028e74dd3a8090741ccd5798" +dependencies = [ + "arrayvec", + "bitflags 2.9.4", + "cfg-if", + "cfg_aliases", + "document-features", + "hashbrown 0.15.3", + "js-sys", + "log", + "naga 26.0.0", "parking_lot", "portable-atomic", "profiling", @@ -6516,9 +6596,9 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", + "wgpu-core 26.0.1", + "wgpu-hal 26.0.4", + "wgpu-types 26.0.0", ] [[package]] @@ -6536,7 +6616,7 @@ dependencies = [ "hashbrown 0.15.3", "indexmap", "log", - "naga", + "naga 25.0.1", "once_cell", "parking_lot", "portable-atomic", @@ -6545,12 +6625,43 @@ dependencies = [ "rustc-hash 1.1.0", "smallvec", "thiserror 2.0.16", - "wgpu-core-deps-apple", - "wgpu-core-deps-emscripten", + "wgpu-core-deps-apple 25.0.0", + "wgpu-core-deps-emscripten 25.0.0", "wgpu-core-deps-wasm", - "wgpu-core-deps-windows-linux-android", - "wgpu-hal", - "wgpu-types", + "wgpu-core-deps-windows-linux-android 25.0.0", + "wgpu-hal 25.0.2", + "wgpu-types 25.0.0", +] + +[[package]] +name = "wgpu-core" +version = "26.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f62f1053bd28c2268f42916f31588f81f64796e2ff91b81293515017ca8bd9" +dependencies = [ + "arrayvec", + "bit-set", + "bit-vec", + "bitflags 2.9.4", + "cfg_aliases", + "document-features", + "hashbrown 0.15.3", + "indexmap", + "log", + "naga 26.0.0", + "once_cell", + "parking_lot", + "portable-atomic", + "profiling", + "raw-window-handle", + "rustc-hash 1.1.0", + "smallvec", + "thiserror 2.0.16", + "wgpu-core-deps-apple 26.0.0", + "wgpu-core-deps-emscripten 26.0.0", + "wgpu-core-deps-windows-linux-android 26.0.0", + "wgpu-hal 26.0.4", + "wgpu-types 26.0.0", ] [[package]] @@ -6559,7 +6670,16 @@ version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfd488b3239b6b7b185c3b045c39ca6bf8af34467a4c5de4e0b1a564135d093d" dependencies = [ - "wgpu-hal", + "wgpu-hal 25.0.2", +] + +[[package]] +name = "wgpu-core-deps-apple" +version = "26.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18ae5fbde6a4cbebae38358aa73fcd6e0f15c6144b67ef5dc91ded0db125dbdf" +dependencies = [ + "wgpu-hal 26.0.4", ] [[package]] @@ -6568,7 +6688,16 @@ version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f09ad7aceb3818e52539acc679f049d3475775586f3f4e311c30165cf2c00445" dependencies = [ - "wgpu-hal", + "wgpu-hal 25.0.2", +] + +[[package]] +name = "wgpu-core-deps-emscripten" +version = "26.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7670e390f416006f746b4600fdd9136455e3627f5bd763abf9a65daa216dd2d" +dependencies = [ + "wgpu-hal 26.0.4", ] [[package]] @@ -6577,7 +6706,7 @@ version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eca8809ad123f6c7f2c5e01a2c7117c4fdfd02f70bd422ee2533f69dfa98756c" dependencies = [ - "wgpu-hal", + "wgpu-hal 25.0.2", ] [[package]] @@ -6586,7 +6715,16 @@ version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cba5fb5f7f9c98baa7c889d444f63ace25574833df56f5b817985f641af58e46" dependencies = [ - "wgpu-hal", + "wgpu-hal 25.0.2", +] + +[[package]] +name = "wgpu-core-deps-windows-linux-android" +version = "26.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "720a5cb9d12b3d337c15ff0e24d3e97ed11490ff3f7506e7f3d98c68fa5d6f14" +dependencies = [ + "wgpu-hal 26.0.4", ] [[package]] @@ -6604,7 +6742,7 @@ dependencies = [ "bytemuck", "cfg-if", "cfg_aliases", - "core-graphics-types", + "core-graphics-types 0.1.3", "glow", "glutin_wgl_sys", "gpu-alloc", @@ -6616,8 +6754,8 @@ dependencies = [ "libc", "libloading", "log", - "metal", - "naga", + "metal 0.31.0", + "naga 25.0.1", "ndk-sys 0.5.0+25.2.9519653", "objc", "ordered-float", @@ -6631,7 +6769,55 @@ dependencies = [ "thiserror 2.0.16", "wasm-bindgen", "web-sys", - "wgpu-types", + "wgpu-types 25.0.0", + "windows 0.58.0", + "windows-core 0.58.0", +] + +[[package]] +name = "wgpu-hal" +version = "26.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7df2c64ac282a91ad7662c90bc4a77d4a2135bc0b2a2da5a4d4e267afc034b9e" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.9.4", + "block", + "bytemuck", + "cfg-if", + "cfg_aliases", + "core-graphics-types 0.2.0", + "glow", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hashbrown 0.15.3", + "js-sys", + "khronos-egl", + "libc", + "libloading", + "log", + "metal 0.32.0", + "naga 26.0.0", + "ndk-sys 0.6.0+11769913", + "objc", + "ordered-float", + "parking_lot", + "portable-atomic", + "portable-atomic-util", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "smallvec", + "thiserror 2.0.16", + "wasm-bindgen", + "web-sys", + "wgpu-types 26.0.0", "windows 0.58.0", "windows-core 0.58.0", ] @@ -6650,6 +6836,20 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wgpu-types" +version = "26.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eca7a8d8af57c18f57d393601a1fb159ace8b2328f1b6b5f80893f7d672c9ae2" +dependencies = [ + "bitflags 2.9.4", + "bytemuck", + "js-sys", + "log", + "thiserror 2.0.16", + "web-sys", +] + [[package]] name = "wide" version = "0.7.32"