Properly support Wayland under EGL and Vulkan. #3358
Merged
Conversation
This file contains 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
bkaradzic
reviewed
Oct 1, 2024
| } | ||
| return (void*)(uintptr_t)win_impl; | ||
| struct wl_surface* surface = (struct wl_surface*)glfwGetWaylandWindow(_window); | ||
| return (void*)surface; |
There was a problem hiding this comment.
Code there was added by @BlockoS, and it looks like he had some reason why it was more complex than just glfwGetWaylandWindow.
There was a problem hiding this comment.
Ah I see below you moved that code in EGL.
There was a problem hiding this comment.
Yeah, the main reason it should be in EGL is to link it up with the resizing events that need to get forwarded to wl_egl_window_resize.
bkaradzic
approved these changes
Oct 1, 2024
|
Long term, I think we should |
|
I like that idea. PR is pre-approved. :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
So, this fixes what #1679 should have done in the first place.
Summary:
wl_egl_windowis only necessary when working with OpenGL. Creating that under Vulkan is plain wrong.wl_egl_windowwhen theNativeWindowHandleTypeis set toWayland.wl_surfaceout of an otherwise-unusedwl_egl_surface.ndhandnwhinbgfx::PlatformData.This PR was constructed after a lot of reading and carefully examining what exactly SDL2 does when you ask it to create the GL context.
Tested these changes with: