diff --git a/Cargo.lock b/Cargo.lock index 04d8c31aeb42..d59f63faccde 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -882,7 +882,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", ] @@ -898,6 +898,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.3", + "core-foundation 0.10.1", + "libc", +] + [[package]] name = "core2" version = "0.4.0" @@ -1340,8 +1351,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#c97c065a575ec6e657bb42872890a00d0fb391c1" dependencies = [ "bytemuck", "emath", @@ -1349,8 +1360,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#c97c065a575ec6e657bb42872890a00d0fb391c1" dependencies = [ "ahash", "bitflags 2.9.3", @@ -1365,8 +1376,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#c97c065a575ec6e657bb42872890a00d0fb391c1" dependencies = [ "ahash", "bytemuck", @@ -1384,10 +1395,9 @@ dependencies = [ [[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#c97c065a575ec6e657bb42872890a00d0fb391c1" dependencies = [ - "ahash", "arboard", "bytemuck", "egui", @@ -1402,8 +1412,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#c97c065a575ec6e657bb42872890a00d0fb391c1" dependencies = [ "ahash", "egui", @@ -1421,8 +1431,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#c97c065a575ec6e657bb42872890a00d0fb391c1" dependencies = [ "bytemuck", ] @@ -1549,8 +1559,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#c97c065a575ec6e657bb42872890a00d0fb391c1" dependencies = [ "ab_glyph", "ahash", @@ -1566,8 +1576,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#c97c065a575ec6e657bb42872890a00d0fb391c1" [[package]] name = "equivalent" @@ -3071,13 +3081,13 @@ dependencies = [ [[package]] name = "metal" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f569fb946490b5743ad69813cb19629130ce9374034abe31614a36402d18f99e" +checksum = "00c15a6f673ff72ddcc22394663290f870fb224c1bfce55734a75c414150e605" dependencies = [ "bitflags 2.9.3", "block", - "core-graphics-types", + "core-graphics-types 0.2.0", "foreign-types", "log", "objc", @@ -3130,25 +3140,26 @@ dependencies = [ [[package]] name = "naga" -version = "25.0.1" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b977c445f26e49757f9aca3631c3b8b836942cb278d69a92e7b80d3b24da632" +checksum = "916cbc7cb27db60be930a4e2da243cf4bc39569195f22fd8ee419cd31d5b662c" dependencies = [ "arrayvec", "bit-set", "bitflags 2.9.3", + "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", - "strum", "thiserror 2.0.16", "unicode-ident", ] @@ -5289,28 +5300,6 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" -[[package]] -name = "strum" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn", -] - [[package]] name = "stub-report" version = "0.1.0" @@ -6474,12 +6463,13 @@ checksum = "a751b3277700db47d3e574514de2eced5e54dc8a5436a3bf7a0b248b2cee16f3" [[package]] name = "wgpu" -version = "25.0.2" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8fb398f119472be4d80bc3647339f56eb63b2a331f6a3d16e25d8144197dd9" +checksum = "70b6ff82bbf6e9206828e1a3178e851f8c20f1c9028e74dd3a8090741ccd5798" dependencies = [ "arrayvec", "bitflags 2.9.3", + "cfg-if", "cfg_aliases", "document-features", "hashbrown 0.15.3", @@ -6502,9 +6492,9 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "25.0.2" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7b882196f8368511d613c6aeec80655160db6646aebddf8328879a88d54e500" +checksum = "d5f62f1053bd28c2268f42916f31588f81f64796e2ff91b81293515017ca8bd9" dependencies = [ "arrayvec", "bit-set", @@ -6534,45 +6524,45 @@ dependencies = [ [[package]] name = "wgpu-core-deps-apple" -version = "25.0.0" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd488b3239b6b7b185c3b045c39ca6bf8af34467a4c5de4e0b1a564135d093d" +checksum = "18ae5fbde6a4cbebae38358aa73fcd6e0f15c6144b67ef5dc91ded0db125dbdf" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-core-deps-emscripten" -version = "25.0.0" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f09ad7aceb3818e52539acc679f049d3475775586f3f4e311c30165cf2c00445" +checksum = "d7670e390f416006f746b4600fdd9136455e3627f5bd763abf9a65daa216dd2d" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-core-deps-wasm" -version = "25.0.0" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca8809ad123f6c7f2c5e01a2c7117c4fdfd02f70bd422ee2533f69dfa98756c" +checksum = "c03b9f9e1a50686d315fc6debe4980cc45cd37b0e919351917df494e8fdc8885" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-core-deps-windows-linux-android" -version = "25.0.0" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cba5fb5f7f9c98baa7c889d444f63ace25574833df56f5b817985f641af58e46" +checksum = "720a5cb9d12b3d337c15ff0e24d3e97ed11490ff3f7506e7f3d98c68fa5d6f14" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-hal" -version = "25.0.2" +version = "26.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f968767fe4d3d33747bbd1473ccd55bf0f6451f55d733b5597e67b5deab4ad17" +checksum = "7df2c64ac282a91ad7662c90bc4a77d4a2135bc0b2a2da5a4d4e267afc034b9e" dependencies = [ "android_system_properties", "arrayvec", @@ -6583,7 +6573,7 @@ dependencies = [ "bytemuck", "cfg-if", "cfg_aliases", - "core-graphics-types", + "core-graphics-types 0.2.0", "glow", "glutin_wgl_sys", "gpu-alloc", @@ -6597,11 +6587,12 @@ dependencies = [ "log", "metal", "naga", - "ndk-sys 0.5.0+25.2.9519653", + "ndk-sys 0.6.0+11769913", "objc", "ordered-float", "parking_lot", "portable-atomic", + "portable-atomic-util", "profiling", "range-alloc", "raw-window-handle", @@ -6617,9 +6608,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "25.0.0" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aa49460c2a8ee8edba3fca54325540d904dd85b2e086ada762767e17d06e8bc" +checksum = "eca7a8d8af57c18f57d393601a1fb159ace8b2328f1b6b5f80893f7d672c9ae2" dependencies = [ "bitflags 2.9.3", "bytemuck", diff --git a/Cargo.toml b/Cargo.toml index 43d9ef4dfae2..59e97b83e203 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,8 +51,8 @@ version = "0.1.0" [workspace.dependencies] tracing = "0.1.41" tracing-subscriber = { version = "0.3.20", features = ["env-filter"] } -naga = { version = "25.0.1", features = ["wgsl-out"] } -wgpu = "25.0.2" +naga = { version = "26.0.0", features = ["wgsl-out"] } +wgpu = "26.0.1" egui = { git = "https://github.com/emilk/egui.git", branch = "main" } clap = { version = "4.5.45", features = ["derive"] } cpal = "0.15.3" diff --git a/core/src/debug_ui/avm1.rs b/core/src/debug_ui/avm1.rs index acc7416ecdd8..f25f90cd4f09 100644 --- a/core/src/debug_ui/avm1.rs +++ b/core/src/debug_ui/avm1.rs @@ -315,11 +315,11 @@ fn show_value_type_combo_box<'gc>( // so just disable the selectable labels to prevent setting to these types. ui.add_enabled( false, - egui::SelectableLabel::new(matches!(value, Value::Object(_)), "Object"), + egui::Button::selectable(matches!(value, Value::Object(_)), "Object"), ); ui.add_enabled( false, - egui::SelectableLabel::new(matches!(value, Value::MovieClip(_)), "MovieClip"), + egui::Button::selectable(matches!(value, Value::MovieClip(_)), "MovieClip"), ); }); new diff --git a/desktop/src/gui/controller.rs b/desktop/src/gui/controller.rs index fcf65b8ae16d..af460164f65b 100644 --- a/desktop/src/gui/controller.rs +++ b/desktop/src/gui/controller.rs @@ -396,6 +396,7 @@ impl GuiController { load: wgpu::LoadOp::Clear(wgpu::Color::BLACK), store: wgpu::StoreOp::Store, }, + depth_slice: None, })], label: Some("egui_render"), ..Default::default() diff --git a/desktop/src/gui/menu_bar.rs b/desktop/src/gui/menu_bar.rs index a35710a0ea8b..65d28ce7e1b0 100644 --- a/desktop/src/gui/menu_bar.rs +++ b/desktop/src/gui/menu_bar.rs @@ -3,7 +3,7 @@ use crate::gui::dialogs::Dialogs; use crate::gui::{text, DebugMessage}; use crate::player::LaunchOptions; use crate::preferences::GlobalPreferences; -use egui::{containers::menu, Button, Key, KeyboardShortcut, Modifiers, Widget}; +use egui::{Button, Key, KeyboardShortcut, Modifiers, Widget}; use ruffle_core::config::Letterbox; use ruffle_core::focus_tracker::DisplayObject; use ruffle_core::{Player, StageScaleMode}; @@ -98,7 +98,7 @@ impl MenuBar { mut player: Option<&mut Player>, ) { egui::TopBottomPanel::top("menu_bar").show(egui_ctx, |ui| { - menu::Bar::new().ui(ui, |ui| { + egui::MenuBar::new().ui(ui, |ui| { self.file_menu(locale, ui, dialogs, player.is_some()); self.view_menu(locale, ui, &mut player); self.controls_menu(locale, ui, dialogs, &mut player); diff --git a/render/naga-agal/src/builder.rs b/render/naga-agal/src/builder.rs index 102013d28aa6..974020f5d9ea 100644 --- a/render/naga-agal/src/builder.rs +++ b/render/naga-agal/src/builder.rs @@ -1194,6 +1194,7 @@ impl<'a> NagaBuilder<'a> { level: naga::SampleLevel::Auto, depth_ref: None, gather: None, + clamp_to_edge: false, }); self.emit_dest_store(dest, tex)?; } diff --git a/render/naga-pixelbender/src/lib.rs b/render/naga-pixelbender/src/lib.rs index 1d0a2474a910..3c515478dcfb 100644 --- a/render/naga-pixelbender/src/lib.rs +++ b/render/naga-pixelbender/src/lib.rs @@ -844,6 +844,7 @@ impl ShaderBuilder<'_> { level: naga::SampleLevel::Auto, depth_ref: None, gather: None, + clamp_to_edge: false, }, Span::UNDEFINED, ); diff --git a/render/wgpu/src/backend.rs b/render/wgpu/src/backend.rs index d10be0ce8073..657079cafac5 100644 --- a/render/wgpu/src/backend.rs +++ b/render/wgpu/src/backend.rs @@ -948,6 +948,7 @@ impl RenderBackend for WgpuRenderBackend { load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT), store: wgpu::StoreOp::Store, }, + depth_slice: None, }), 1, // When running a standalone shader, we always process the entire image diff --git a/render/wgpu/src/context3d/mod.rs b/render/wgpu/src/context3d/mod.rs index 2f6e5f99a968..2f4ebfbdeed7 100644 --- a/render/wgpu/src/context3d/mod.rs +++ b/render/wgpu/src/context3d/mod.rs @@ -248,6 +248,7 @@ impl WgpuContext3D { load: color_load, store: wgpu::StoreOp::Store, }, + depth_slice: None, })], depth_stencil_attachment, ..Default::default() diff --git a/render/wgpu/src/surface/target.rs b/render/wgpu/src/surface/target.rs index 96000d3fd79f..9a94d3e7fb44 100644 --- a/render/wgpu/src/surface/target.rs +++ b/render/wgpu/src/surface/target.rs @@ -368,6 +368,7 @@ impl CommandTarget { load, store: wgpu::StoreOp::Store, }, + depth_slice: None, }) } diff --git a/render/wgpu/src/utils.rs b/render/wgpu/src/utils.rs index 0a96e065e916..c49b15e9946f 100644 --- a/render/wgpu/src/utils.rs +++ b/render/wgpu/src/utils.rs @@ -249,6 +249,7 @@ pub fn run_copy_pipeline( store: wgpu::StoreOp::Store, }, resolve_target: None, + depth_slice: None, })], ..Default::default() });