[wgpu-hal] Upgrade glutin to 0.31
#6150
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Author
|
Contributor
Author
|
Regarding the build-failure, |
MarijnS95
force-pushed
the
glutin-0.31
branch
2 times, most recently
from
a22cada to
0181b88
Compare
Contributor
Author
|
The duplicate |
6 tasks
MarijnS95
force-pushed
the
glutin-0.31
branch
2 times, most recently
from
dc33e03 to
c28fa09
Compare
cwfitzgerald
requested changes
Aug 27, 2024
Member
cwfitzgerald
left a comment
cwfitzgerald
left a comment
There was a problem hiding this comment.
Looking good in general, some small questions
`glutin 0.30` onwards completely refactored its internals to no longer be reliant on `winit`, as they (by default) have no direct relation except needing to perform _some_ operations (platform-specific) at strategic times in window creation and event loop handling. Most of that is handled by a new `glutin-winit` introp crate, while the core `glutin` crate now exclusively focuses on wrapping the various OpenGL context APIs (CGL, EGL, WGL, ...). This does result in a little more verbose handling to get the right `GLDisplay`, `GLConfig`, `GLContext` and `GLSurface`, but gives much more control and makes all intricacies more explicit. Most of the code was copied from `glutin 0.31`'s example crate, with the code for transparency support removed. Note that the example doesn't at all handle event loop events properly: resizes and redraws are not listened to, and mobile-specific surface events (`Resumed` and `Suspended`) are equally ignored.
6 tasks
MarijnS95
added a commit
to MarijnS95/wgpu
that referenced
this pull request
Aug 28, 2024
PR gfx-rs#6150 suffered a much larger rebase "hell" than I anticipated. On my Linux box I made this change, but lost it while force-pushing from Windows (and created some other compiler errors while at it...). By disabling all features on `glutin`/`glutin-winit` (the latter only uses `x11`, and only forwards `wayland` to `glutin`) we may have dropped a lot of "unused" dependencies for other GL backends, but also made the crate unable to import X11 (Xlib/Xcb) and Wayland handles into EGL. Also import the missing `glutin::context::Version` struct again which was added last-minute to gfx-rs#6150 (to make sure my Intel card on Windows creates a GLES 3.0+ instead of GLES 2.0 context) while the import was accidentally squashed into gfx-rs#6152 (not merged yet).
6 tasks
teoxoy
pushed a commit
that referenced
this pull request
Aug 28, 2024
PR #6150 suffered a much larger rebase "hell" than I anticipated. On my Linux box I made this change, but lost it while force-pushing from Windows (and created some other compiler errors while at it...). By disabling all features on `glutin`/`glutin-winit` (the latter only uses `x11`, and only forwards `wayland` to `glutin`) we may have dropped a lot of "unused" dependencies for other GL backends, but also made the crate unable to import X11 (Xlib/Xcb) and Wayland handles into EGL. Also import the missing `glutin::context::Version` struct again which was added last-minute to #6150 (to make sure my Intel card on Windows creates a GLES 3.0+ instead of GLES 2.0 context) while the import was accidentally squashed into #6152 (not merged yet).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Connections
Closes #5649 and should help towards #5709 where
raw-window-handlecan be used.Description
glutin 0.30onwards completely refactored its internals to no longer be reliant onwinit, as they (by default) have no direct relation except needing to perform some operations (platform-specific) at strategic times in window creation and event loop handling. Most of that is handled by a newglutin-winitintrop crate, while the coreglutincrate now exclusively focuses on wrapping the various OpenGL context APIs (CGL, EGL, WGL, ...).This does result in a little more verbose handling to get the right
GLDisplay,GLConfig,GLContextandGLSurface, but gives much more control and makes all intricacies more explicit. Most of the code was copied fromglutin 0.31's example crate, with the code for transparency support removed.Note that the example doesn't at all handle event loop events properly: resizes and redraws are not listened to, and mobile-specific surface events (
ResumedandSuspended) are equally ignored.Testing
cargo r --example raw-glesonwaylandonly with an AMD GPU and Mesa drivers (for now).Checklist
cargo fmt.cargo clippy. If applicable, add:--target wasm32-unknown-unknown--target wasm32-unknown-emscriptencargo xtask testto run tests.CHANGELOG.md. See simple instructions inside file.