desktop: Switch to wgpu 24 and egui git master

ruffle-rs · Jan 16, 2025 · 0cb8ea5 · 0cb8ea5
1 parent 601ee06
commit 0cb8ea5
Show file tree

Hide file tree

Showing 17 changed files with 121 additions and 83 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -48,9 +48,9 @@ version = "0.1.0"
 [workspace.dependencies]
 tracing = "0.1.41"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
-naga = { version = "23.1.0", features = ["wgsl-out"] }
-wgpu = "23.0.1"
-egui = "0.30.0"
+naga = { version = "24.0.0", features = ["wgsl-out"] }
+wgpu = "24.0.0"
+egui = { git = "https://github.com/emilk/egui.git", branch = "master" }
 clap = { version = "4.5.26", features = ["derive"] }
 cpal = "0.15.3"
 anyhow = "1.0"

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.13.0"
 egui = { workspace = true, optional = true }
-egui_extras = { version = "0.30.0", default-features = false, optional = true }
+egui_extras = { git = "https://github.com/emilk/egui.git", branch = "master", default-features = false, optional = true }
 png = { version = "0.17.16", optional = true }
 flv-rs = { path = "../flv" }
 async-channel = { workspace = true }

diff --git a/deny.toml b/deny.toml
@@ -84,6 +84,9 @@ unknown-git = "deny"
 # github.com organizations to allow git sources for
 github = [
     "ruffle-rs",
+    # TODO: Remove once a release with https://github.com/emilk/egui/pull/5610
+    # (the wgpu bump to 24.0.0) in it is out.
+    "emilk",
 ]
 
 [advisories]

diff --git a/desktop/Cargo.toml b/desktop/Cargo.toml
@@ -14,10 +14,10 @@ workspace = true
 clap = { workspace = true }
 cpal = { workspace = true }
 egui = { workspace = true }
-egui_extras = { version = "0.30.0", default-features = false, features = ["image"] }
-egui-wgpu = { version = "0.30.0", features = ["winit"] }
+egui_extras = { git = "https://github.com/emilk/egui.git", branch = "master", default-features = false, features = ["image"] }
+egui-wgpu = { git = "https://github.com/emilk/egui.git", branch = "master", features = ["winit"] }
 image = { workspace = true, features = ["png"] }
-egui-winit = "0.30.0"
+egui-winit = { git = "https://github.com/emilk/egui.git", branch = "master" }
 fontdb = "0.23"
 ruffle_core = { path = "../core", features = ["audio", "clap", "mp3", "aac", "nellymoser", "default_compatibility_rules", "egui"] }
 ruffle_render = { path = "../render", features = ["clap"] }