Fix eglGetPlatformDisplay() and glDebugMessageCallback() #315
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
glDebugMessageCallback() is defined with GL_KHR_debug and on OpenGL ES 3.2, but it has the KHR suffix on the older OpenGL ES versions with GL_KHR_debug. For OpenGL ES, libepoxy needs to resolve the function with the KHR suffix if GL_KHR_debug is present, and to resolve it without the suffix otherwise. However, libepoxy incorrectly tries to resolve the function without the suffix if GL_KHR_debug is present because it is confused with the extension definition for desktop that doesn't use the suffix. This can result in a non-functional resolution of glDebugMessageCallback(). For example, an OpenGL ES implementation, ANGLE can always resolve the function whether the name is suffixed or not. However, the function resolved without the suffix is non-functional if it exposes a version older than 3.2. To fix this issue, distinguish between the extension definitions for desktop and those for OpenGL ES. This prevents libepoxy to try resolving glDebugMessageCallback() without the KHR suffix on OpenGL ES and lets it try resolving it with the suffix when GL_KHR_debug is present.
eglGetPlatformDisplay() may be used to get a display for a rendering context. However, epoxy_conservative_egl_version() cannot report a correct version without a display and "conservatively" reports 1.4 instead. This disables eglGetPlatformDisplay(), which is available only since 1.5. To fix this issue, query the client version for eglGetPlatformDisplay(). The client version is a concept introduced with 1.5, and does not require a display to query. Failing the query implies the version is older than 1.5 and eglGetPlatformDisplay() is not supported.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
This pull request contains two fixes and the latter depends on the earlier. Please refer to each commit for explanation.