render,core,desktop: Port to wgpu v0.20.0

ruffle-rs · May 7, 2024 · 86659d0 · 86659d0
1 parent 79137ec
commit 86659d0
Show file tree

Hide file tree

Showing 20 changed files with 82 additions and 102 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -47,10 +47,10 @@ version = "0.1.0"
 [workspace.dependencies]
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
-naga = { version = "0.19.2", features = ["wgsl-out"] }
-naga_oil = "0.13.0"
-wgpu = "0.19.4"
-egui = "0.27.2"
+naga = { version = "0.20.0", features = ["wgsl-out"] }
+naga_oil = { git = "https://github.com/Elabajaba/naga_oil.git", branch = "wgpu-0.20" }
+wgpu = "0.20.0"
+egui = { git = "https://github.com/emilk/egui.git", branch = "master" }
 clap = { version = "4.5.4", features = ["derive"] }
 anyhow = "1.0"
 slotmap = "1.0.7"

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -55,7 +55,7 @@ hashbrown = { version = "0.14.5", features = ["raw"] }
 scopeguard = "1.2.0"
 fluent-templates = "0.9.4"
 egui = { workspace = true, optional = true }
-egui_extras = { version = "0.27.2", optional = true }
+egui_extras = { git = "https://github.com/emilk/egui.git", branch = "master", optional = true }
 png = { version = "0.17.13", optional = true }
 flv-rs = { path = "../flv" }
 async-channel = { workspace = true }

diff --git a/core/src/debug_ui/avm1.rs b/core/src/debug_ui/avm1.rs
@@ -32,7 +32,7 @@ impl Avm1ObjectWindow {
         Window::new(object_name(object))
             .id(Id::new(object.as_ptr()))
             .open(&mut keep_open)
-            .scroll2([true, true])
+            .scroll([true, true])
             .show(egui_ctx, |ui| {
                 Grid::new(ui.id().with("properties"))
                     .num_columns(2)

diff --git a/core/src/debug_ui/avm2.rs b/core/src/debug_ui/avm2.rs
@@ -48,7 +48,7 @@ impl Avm2ObjectWindow {
         Window::new(object_name(activation.context.gc_context, object))
             .id(Id::new(object.as_ptr()))
             .open(&mut keep_open)
-            .scroll2([true, true])
+            .scroll([true, true])
             .show(egui_ctx, |ui| {
                 ui.horizontal(|ui| {
                     ui.selectable_value(&mut self.open_panel, Panel::Information, "Information");

diff --git a/core/src/debug_ui/display_object.rs b/core/src/debug_ui/display_object.rs
@@ -116,7 +116,7 @@ impl DisplayObjectWindow {
         Window::new(summary_name(object))
             .id(Id::new(object.as_ptr()))
             .open(&mut keep_open)
-            .scroll2([true, true])
+            .scroll([true, true])
             .show(egui_ctx, |ui| {
                 ui.horizontal(|ui| {
                     ui.selectable_value(&mut self.open_panel, Panel::Position, "Position");