Skip to content

Commit 4fe0fa6

Browse files
committed
desktop: Switch to wgpu 24 and egui git master
1 parent 601ee06 commit 4fe0fa6

File tree

18 files changed

+122
-84
lines changed

18 files changed

+122
-84
lines changed

Cargo.lock

+75-46
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ version = "0.1.0"
4848
[workspace.dependencies]
4949
tracing = "0.1.41"
5050
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
51-
naga = { version = "23.1.0", features = ["wgsl-out"] }
52-
wgpu = "23.0.1"
53-
egui = "0.30.0"
51+
naga = { version = "24.0.0", features = ["wgsl-out"] }
52+
wgpu = "24.0.0"
53+
egui = { git = "https://github.com/emilk/egui.git", branch = "master" }
5454
clap = { version = "4.5.26", features = ["derive"] }
5555
cpal = "0.15.3"
5656
anyhow = "1.0"

core/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ hashbrown = { version = "0.14.5", features = ["raw"] }
5555
scopeguard = "1.2.0"
5656
fluent-templates = "0.13.0"
5757
egui = { workspace = true, optional = true }
58-
egui_extras = { version = "0.30.0", default-features = false, optional = true }
58+
egui_extras = { git = "https://github.com/emilk/egui.git", branch = "master", default-features = false, optional = true }
5959
png = { version = "0.17.16", optional = true }
6060
flv-rs = { path = "../flv" }
6161
async-channel = { workspace = true }

deny.toml

+3
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ unknown-git = "deny"
8484
# github.com organizations to allow git sources for
8585
github = [
8686
"ruffle-rs",
87+
# TODO: Remove once a release with https://github.com/emilk/egui/pull/5610
88+
# (the wgpu bump to 24.0.0) in it is out.
89+
"emilk",
8790
]
8891

8992
[advisories]

desktop/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ workspace = true
1414
clap = { workspace = true }
1515
cpal = { workspace = true }
1616
egui = { workspace = true }
17-
egui_extras = { version = "0.30.0", default-features = false, features = ["image"] }
18-
egui-wgpu = { version = "0.30.0", features = ["winit"] }
17+
egui_extras = { git = "https://github.com/emilk/egui.git", branch = "master", default-features = false, features = ["image"] }
18+
egui-wgpu = { git = "https://github.com/emilk/egui.git", branch = "master", features = ["winit"] }
1919
image = { workspace = true, features = ["png"] }
20-
egui-winit = "0.30.0"
20+
egui-winit = { git = "https://github.com/emilk/egui.git", branch = "master" }
2121
fontdb = "0.23"
2222
ruffle_core = { path = "../core", features = ["audio", "clap", "mp3", "aac", "nellymoser", "default_compatibility_rules", "egui"] }
2323
ruffle_render = { path = "../render", features = ["clap"] }

0 commit comments

Comments
 (0)