Fix compilation errors on GLES platforms#16479
Merged
alalek merged 2 commits intoopencv:3.4from Feb 2, 2020
Merged
Conversation
GL/glx.h is included on all LINUX plattforms, which is wrong for a number of reasons: - GL_PERSPECTIVE_CORRECTION_HINT is defined in GL/gl.h, so we want gl.h not glx.h, the latter just includes the former - GL/gl.h is a Desktop GL header, and should not be included on GLES plattforms - GL/gl.h is already included via QtOpenGL -> QtGui/qopengl.h on desktop plattforms This fixes a problem when Qt is compiled with GLES, which is often done on ARM platforms where desktop GL is not or only poorly supported (e.g. slow due to emulation). Fixes part of opencv#9171.
GL_PERSPECTIVE_CORRECTION_HINT does not exist in GLES 2.0/3.x, and has been deprecated in OpenGL 3.0 core profiles. Fixes part of opencv#9171.
alalek
approved these changes
Feb 2, 2020
Member
alalek
left a comment
There was a problem hiding this comment.
Looks good to me! Thank you for the contribution 👍
Merged
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
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.
resolves #9171