1
0
mirror of https://github.com/emilk/egui.git synced 2026-08-30 13:20:05 -04:00

Glutin Upgrade (#2187)

* working. but x11 blurry

* fixed x11 blurry. was just accidentally using multisampling even when user didnt request it

* allow dbg macro temporarily

* add windows WGL fallback support when EGL fails

* fmt

* glutin features explicitly added

* extract glutin context creation into a fn

* fix warnings
This commit is contained in:
Red Artist
2022-12-05 16:04:28 +05:30
committed by GitHub
parent 3ba39c3022
commit 8eb687cf04
3 changed files with 239 additions and 38 deletions

83
Cargo.lock generated
View File

@@ -1261,11 +1261,12 @@ dependencies = [
"egui-winit",
"egui_glow",
"glow",
"glutin",
"glutin 0.30.0",
"image",
"js-sys",
"percent-encoding",
"puffin",
"raw-window-handle 0.5.0",
"ron",
"serde",
"tracing",
@@ -1399,7 +1400,7 @@ dependencies = [
"egui",
"egui-winit",
"glow",
"glutin",
"glutin 0.29.1",
"memoffset",
"puffin",
"tracing",
@@ -1863,7 +1864,7 @@ dependencies = [
"backtrace",
"fnv",
"gl_generator",
"glutin",
"glutin 0.29.1",
"lazy_static",
"memoffset",
"smallvec",
@@ -1897,10 +1898,10 @@ dependencies = [
"cgl",
"cocoa",
"core-foundation",
"glutin_egl_sys",
"glutin_egl_sys 0.1.6",
"glutin_gles2_sys",
"glutin_glx_sys",
"glutin_wgl_sys",
"glutin_glx_sys 0.1.8",
"glutin_wgl_sys 0.1.5",
"libloading",
"log",
"objc",
@@ -1914,6 +1915,29 @@ dependencies = [
"winit",
]
[[package]]
name = "glutin"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34acbf502536f1d125f0fc09b6ad8824e93e6da7b99e86d3383e6b8310ba3554"
dependencies = [
"bitflags",
"cfg_aliases",
"cgl",
"cocoa",
"core-foundation",
"glutin_egl_sys 0.3.0",
"glutin_glx_sys 0.3.0",
"glutin_wgl_sys 0.3.0",
"libloading",
"objc",
"once_cell",
"raw-window-handle 0.5.0",
"wayland-sys 0.30.0-beta.12",
"windows-sys",
"x11-dl",
]
[[package]]
name = "glutin_egl_sys"
version = "0.1.6"
@@ -1924,6 +1948,16 @@ dependencies = [
"winapi",
]
[[package]]
name = "glutin_egl_sys"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c3c95a2d7a54bab0c74759794efb5cd63470d4504cbe85ed4114dc82c98bdc1"
dependencies = [
"gl_generator",
"windows-sys",
]
[[package]]
name = "glutin_gles2_sys"
version = "0.1.5"
@@ -1944,6 +1978,16 @@ dependencies = [
"x11-dl",
]
[[package]]
name = "glutin_glx_sys"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "947c4850c58211c9627969c2b4e2674764b81ae5b47bab2c9a477d7942f96e0f"
dependencies = [
"gl_generator",
"x11-dl",
]
[[package]]
name = "glutin_wgl_sys"
version = "0.1.5"
@@ -1953,6 +1997,15 @@ dependencies = [
"gl_generator",
]
[[package]]
name = "glutin_wgl_sys"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20c33975a6c9d49d72c8f032a60079bf8df536954fbf9e4cee90396ace815c57"
dependencies = [
"gl_generator",
]
[[package]]
name = "gobject-sys"
version = "0.15.10"
@@ -4246,7 +4299,7 @@ dependencies = [
"scoped-tls",
"wayland-commons",
"wayland-scanner",
"wayland-sys",
"wayland-sys 0.29.4",
]
[[package]]
@@ -4258,7 +4311,7 @@ dependencies = [
"nix 0.22.3",
"once_cell",
"smallvec",
"wayland-sys",
"wayland-sys 0.29.4",
]
[[package]]
@@ -4279,7 +4332,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83281d69ee162b59031c666385e93bde4039ec553b90c4191cdb128ceea29a3a"
dependencies = [
"wayland-client",
"wayland-sys",
"wayland-sys 0.29.4",
]
[[package]]
@@ -4316,6 +4369,18 @@ dependencies = [
"pkg-config",
]
[[package]]
name = "wayland-sys"
version = "0.30.0-beta.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1117fe4570fe063122ba2b1b1e39e56fb1a73921d395f9288af06af0dd1c7f55"
dependencies = [
"dlib",
"lazy_static",
"log",
"pkg-config",
]
[[package]]
name = "web-sys"
version = "0.3.60"