render,desktop: Port to wgpu v0.20.0, update webbrowser to `v1.…

…0.0`

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"

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 }

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)

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");

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");

core/src/debug_ui/display_object/search.rs

@@ -56,7 +56,7 @@ impl DisplayObjectSearchWindow {
 
         Window::new("Display Object Picker")
             .open(&mut keep_open)
-            .scroll2([true, true])
+            .scroll([true, true])
             .show(egui_ctx, |ui| {
                 ui.horizontal(|ui| {
                     ui.checkbox(&mut self.include_hidden, "Include Hidden");

core/src/debug_ui/movie.rs

@@ -28,7 +28,7 @@ impl MovieListWindow {
 
         Window::new("Known Movie List")
             .open(&mut keep_open)
-            .scroll2([true, true])
+            .scroll([true, true])
             .show(egui_ctx, |ui| {
                 let movies = context.library.known_movies();
 
@@ -81,7 +81,7 @@ impl MovieWindow {
         Window::new(movie_name(&movie))
             .id(Id::new(Arc::as_ptr(&movie)))
             .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");

desktop/Cargo.toml

@@ -14,10 +14,10 @@ workspace = true
 clap = { workspace = true }
 cpal = "0.15.3"
 egui = { workspace = true }
-egui_extras = { version = "0.27.2", features = ["image"] }
-egui-wgpu = { version = "0.27.2", features = ["winit"] }
+egui_extras = { git = "https://github.com/emilk/egui.git", branch = "master" , features = ["image"] }
+egui-wgpu = { git = "https://github.com/emilk/egui.git", branch = "master", features = ["winit"] }
 image = { workspace = true, features = ["png"] }
-egui-winit = "0.27.2"
+egui-winit = { git = "https://github.com/emilk/egui.git", branch = "master" }
 fontdb = "0.16"
 ruffle_core = { path = "../core", features = ["audio", "clap", "mp3", "nellymoser", "default_compatibility_rules", "egui"] }
 ruffle_render = { path = "../render", features = ["clap"] }
@@ -28,7 +28,7 @@ tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 tracing-appender = "0.2.3"
 winit = "0.29.15"
-webbrowser = "0.8.15"
+webbrowser = "1.0.0"
 url = { workspace = true }
 dirs = "5.0"
 rfd = "0.14.1"

desktop/src/gui/movie.rs

@@ -87,6 +87,7 @@ impl MovieViewRenderer {
                     // 1: vec2 texture coordinates
                     attributes: &wgpu::vertex_attr_array![0 => Float32x2, 1 => Float32x2],
                 }],
+                compilation_options: Default::default(),
             },
             primitive: wgpu::PrimitiveState {
                 topology: wgpu::PrimitiveTopology::TriangleList,
@@ -116,6 +117,7 @@ impl MovieViewRenderer {
                     blend: Some(wgpu::BlendState::REPLACE),
                     write_mask: wgpu::ColorWrites::ALL,
                 })],
+                compilation_options: Default::default(),
             }),
             multiview: None,
         });

frontend-utils/Cargo.toml

@@ -24,7 +24,7 @@ futures = { workspace = true }
 async-io = "2.3.2"
 async-net = "2.0.0"
 futures-lite = "2.3.0"
-webbrowser = "0.8.15"
+webbrowser = "1.0.0"
 reqwest = { version = "0.12.4", default-features = false, features = ["rustls-tls", "cookies", "charset", "http2", "macos-system-configuration"] }
 tokio = { workspace = true }