Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update wgpu 0.13 to wgpu 0.14, and egui to latest #189

Merged
merged 1 commit into from
Oct 11, 2022
Merged

Update wgpu 0.13 to wgpu 0.14, and egui to latest #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 29 additions & 41 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ opt-level = 2
debug = true

[patch.crates-io]
# 2022-10-06 - wgpu on web
eframe = { git = "https://github.com/emilk/egui", rev = "3ec170cc1e2309345df04b5e2a083b3b452c012f" }
egui = { git = "https://github.com/emilk/egui", rev = "3ec170cc1e2309345df04b5e2a083b3b452c012f" }
egui_extras = { git = "https://github.com/emilk/egui", rev = "3ec170cc1e2309345df04b5e2a083b3b452c012f" }
egui_glow = { git = "https://github.com/emilk/egui", rev = "3ec170cc1e2309345df04b5e2a083b3b452c012f" }
egui-wgpu = { git = "https://github.com/emilk/egui", rev = "3ec170cc1e2309345df04b5e2a083b3b452c012f" }
# 2022-10-11 - wgpu update
eframe = { git = "https://github.com/emilk/egui", rev = "7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b" }
egui = { git = "https://github.com/emilk/egui", rev = "7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b" }
egui_extras = { git = "https://github.com/emilk/egui", rev = "7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b" }
egui_glow = { git = "https://github.com/emilk/egui", rev = "7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b" }
egui-wgpu = { git = "https://github.com/emilk/egui", rev = "7803285221aa65cfdbcb2dc3d5efd2e318fa8f9b" }

# Because gltf hasn't published a new version: https://github.com/gltf-rs/gltf/issues/357
gltf = { git = "https://github.com/rerun-io/gltf", rev = "3c14ded73755d1ce9e47010edb06db63cb7e2cca" }
2 changes: 1 addition & 1 deletion crates/re_viewer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ three-d-asset = { version = "0.3.0", optional = true, default-features = false,
] }

egui-wgpu = { version = "0.19", optional = true }
wgpu = { version = "0.13", optional = true, features = ["webgl"] }
wgpu = { version = "0.14", optional = true, features = ["webgl"] }


# native dependencies:
Expand Down