migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-01 14:20:04 -04:00
Code Activity

Update wgpu to 0.19 (#3824)

Browse Source 
* Closes https://github.com/emilk/egui/issues/3675

---------

Co-authored-by: Andreas Reich <r_andreas2@web.de>
Co-authored-by: Mingun <Alexander_Sergey@mail.ru>
This commit is contained in:
Emil Ernerfeldt
2024-01-19 10:14:13 +01:00
committed by GitHub
parent 7733d1d87c
commit b766a48fa7
27 changed files with 578 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
crates/egui_glow/Cargo.toml
View File

@@ -40,7 +40,7 @@ links = ["egui-winit?/links"]
puffin = ["dep:puffin", "egui-winit?/puffin", "egui/puffin"]
## Enable [`winit`](https://docs.rs/winit) integration.
winit = ["egui-winit"]
winit = ["egui-winit", "dep:winit"]
[dependencies]
@@ -52,6 +52,10 @@ bytemuck = "1.7"
glow.workspace = true
log = { version = "0.4", features = ["std"] }
memoffset = "0.7"
# glutin stuck on old version of raw-window-handle:
rwh_05 = { package = "raw-window-handle", version = "0.5.2", features = [
"std",
] }
#! ### Optional dependencies
## Enable this when generating docs.
@@ -61,6 +65,10 @@ document-features = { version = "0.2", optional = true }
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
egui-winit = { version = "0.25.0", path = "../egui-winit", optional = true, default-features = false }
puffin = { workspace = true, optional = true }
winit = { workspace = true, optional = true, default-features = false, features = [
"rwh_05", # glutin stuck on old version of raw-window-handle
"rwh_06", # for compatibility with egui-winit
] }
# Web:
[target.'cfg(target_arch = "wasm32")'.dependencies]
@@ -69,8 +77,7 @@ wasm-bindgen = "0.2"
[dev-dependencies]
glutin = "0.31" # examples/pure_glow
raw-window-handle.workspace = true
glutin = "0.31" # examples/pure_glow
glutin-winit = "0.4.0"

2
crates/egui_glow/examples/pure_glow.rs
View File

@@ -24,7 +24,7 @@ impl GlutinWindowContext {
use glutin::display::GetGlDisplay;
use glutin::display::GlDisplay;
use glutin::prelude::GlSurface;
use raw_window_handle::HasRawWindowHandle;
use rwh_05::HasRawWindowHandle;
let winit_window_builder = winit::window::WindowBuilder::new()
.with_resizable(true)
.with_inner_size(winit::dpi::LogicalSize {