Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 55 additions & 64 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions core/src/debug_ui/avm1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions desktop/src/gui/controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions desktop/src/gui/menu_bar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions render/naga-agal/src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)?;
}
Expand Down
1 change: 1 addition & 0 deletions render/naga-pixelbender/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,7 @@ impl ShaderBuilder<'_> {
level: naga::SampleLevel::Auto,
depth_ref: None,
gather: None,
clamp_to_edge: false,
},
Span::UNDEFINED,
);
Expand Down
1 change: 1 addition & 0 deletions render/wgpu/src/backend.rs
Original file line number Diff line number Diff line change
Expand Up @@ -948,6 +948,7 @@ impl<T: RenderTarget + 'static> RenderBackend for WgpuRenderBackend<T> {
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
Expand Down
1 change: 1 addition & 0 deletions render/wgpu/src/context3d/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ impl WgpuContext3D {
load: color_load,
store: wgpu::StoreOp::Store,
},
depth_slice: None,
})],
depth_stencil_attachment,
..Default::default()
Expand Down
Loading
Loading