wlc: Use eglGetPlatformDisplayEXT where available #233
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
eglGetDisplay does not know what sort of handle it is getting passed in (a gbm device handle or an X11 display pointer) on systems without glvnd some poking into internal X11 / gbm structures is used to figure this out, which is somewhat dangerous but works. On system using glvnd this does not work and eglGetDisplay returns NULL. This commit makes wlc track the EGLNativeDisplayType pointer's underlying type and uses eglGetPlatformDisplayEXT where available so that the EGL implementation does not need to guess the type of the handle it is being passed. BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1413579 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Cloudef
reviewed
Jan 31, 2017
| static EGLDisplay | ||
| get_display(struct ctx *context, EGLint type, void *native) | ||
| { | ||
| PFNEGLGETPLATFORMDISPLAYEXTPROC getPlatformDisplayEXT; |
There was a problem hiding this comment.
Was this accidental duplicate definition? Otherwise this looks quite good. Scary but good :)
|
Hi,
On 31-01-17 15:07, Jari Vetoniemi wrote:
***@***.**** commented on this pull request.
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
In src/platform/context/egl.c <#233 (review)>:
> + * 2: You can't tell whether you have EGL 1.5 at this point, because
+ * eglQueryString(EGL_VERSION) is a property of the display, which we don't
+ * have yet. So you have to query for extensions no matter what.
+ *
+ * 3. There is no EGL_KHR_platform_base to complement the EXT one, thus one
+ * needs to know EGL 1.5 is supported in order to use the eglGetPlatformDisplay
+ * function pointer.
+ *
+ * We can workaround this (circular dependency) by probing for the EGL 1.5
+ * platform extensions (EGL_KHR_platform_gbm and friends) yet it doesn't seem
+ * like mesa will be able to adverise these (even though it can do EGL 1.5).
+ */
+static EGLDisplay
+get_display(struct ctx *context, EGLint type, void *native)
+{
+ PFNEGLGETPLATFORMDISPLAYEXTPROC getPlatformDisplayEXT;
Was this accidental duplicate definition? Otherwise this looks quite good. Scary but good :)
Yes, that was a copy paste mistake the top level one can be removed.
Regards,
Hans
|
Merged
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.
eglGetDisplay does not know what sort of handle it is getting passed
in (a gbm device handle or an X11 display pointer) on systems without
glvnd some poking into internal X11 / gbm structures is used to figure
this out, which is somewhat dangerous but works.
On system using glvnd this does not work and eglGetDisplay returns NULL.
This commit makes wlc track the EGLNativeDisplayType pointer's
underlying type and uses eglGetPlatformDisplayEXT where available so
that the EGL implementation does not need to guess the type of the
handle it is being passed.
BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1413579
Signed-off-by: Hans de Goede hdegoede@redhat.com