Skip to content

Commit c0bf693

Browse files
committed
chore: Update wgpu to 26, egui to match
1 parent a6271e8 commit c0bf693

File tree

10 files changed

+66
-68
lines changed

10 files changed

+66
-68
lines changed

Cargo.lock

Lines changed: 55 additions & 64 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ version = "0.1.0"
5151
[workspace.dependencies]
5252
tracing = "0.1.41"
5353
tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
54-
naga = { version = "25.0.1", features = ["wgsl-out"] }
55-
wgpu = "25.0.2"
54+
naga = { version = "26.0.0", features = ["wgsl-out"] }
55+
wgpu = "26.0.1"
5656
egui = { git = "https://github.com/emilk/egui.git", branch = "main" }
5757
clap = { version = "4.5.48", features = ["derive"] }
5858
cpal = "0.15.3"

desktop/src/gui/controller.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,7 @@ impl GuiController {
407407
load: wgpu::LoadOp::Clear(wgpu::Color::BLACK),
408408
store: wgpu::StoreOp::Store,
409409
},
410+
depth_slice: None,
410411
})],
411412
label: Some("egui_render"),
412413
..Default::default()

desktop/src/gui/menu_bar.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::gui::dialogs::Dialogs;
33
use crate::gui::{text, DebugMessage};
44
use crate::player::LaunchOptions;
55
use crate::preferences::GlobalPreferences;
6-
use egui::{containers::menu, Button, Key, KeyboardShortcut, Modifiers, Widget};
6+
use egui::{Button, Key, KeyboardShortcut, Modifiers, Widget};
77
use ruffle_core::config::Letterbox;
88
use ruffle_core::focus_tracker::DisplayObject;
99
use ruffle_core::{Player, StageScaleMode};
@@ -98,7 +98,7 @@ impl MenuBar {
9898
mut player: Option<&mut Player>,
9999
) {
100100
egui::TopBottomPanel::top("menu_bar").show(egui_ctx, |ui| {
101-
menu::Bar::new().ui(ui, |ui| {
101+
egui::MenuBar::new().ui(ui, |ui| {
102102
self.file_menu(locale, ui, dialogs, player.is_some());
103103
self.view_menu(locale, ui, &mut player);
104104
self.controls_menu(locale, ui, dialogs, &mut player);

render/naga-agal/src/builder.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1196,6 +1196,7 @@ impl<'a> NagaBuilder<'a> {
11961196
level: naga::SampleLevel::Auto,
11971197
depth_ref: None,
11981198
gather: None,
1199+
clamp_to_edge: false,
11991200
});
12001201
self.emit_dest_store(dest, tex)?;
12011202
}

render/naga-pixelbender/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -844,6 +844,7 @@ impl ShaderBuilder<'_> {
844844
level: naga::SampleLevel::Auto,
845845
depth_ref: None,
846846
gather: None,
847+
clamp_to_edge: false,
847848
},
848849
Span::UNDEFINED,
849850
);

render/wgpu/src/backend.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -948,6 +948,7 @@ impl<T: RenderTarget + 'static> RenderBackend for WgpuRenderBackend<T> {
948948
load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
949949
store: wgpu::StoreOp::Store,
950950
},
951+
depth_slice: None,
951952
}),
952953
1,
953954
// When running a standalone shader, we always process the entire image

render/wgpu/src/context3d/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ impl WgpuContext3D {
248248
load: color_load,
249249
store: wgpu::StoreOp::Store,
250250
},
251+
depth_slice: None,
251252
})],
252253
depth_stencil_attachment,
253254
..Default::default()

render/wgpu/src/surface/target.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,7 @@ impl CommandTarget {
368368
load,
369369
store: wgpu::StoreOp::Store,
370370
},
371+
depth_slice: None,
371372
})
372373
}
373374

render/wgpu/src/utils.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ pub fn run_copy_pipeline(
249249
store: wgpu::StoreOp::Store,
250250
},
251251
resolve_target: None,
252+
depth_slice: None,
252253
})],
253254
..Default::default()
254255
});

0 commit comments

Comments
 (0)