• StefanBruens's avatar
    Merge pull request #16479 from StefanBruens:fix_gles_glx_h_include · f05d5888
    StefanBruens authored
    Fix compilation errors on GLES platforms
    
    * Do not include glx.h when using GLES
    
    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 #9171.
    
    * Only set GL_PERSPECTIVE_CORRECTION_HINT when GL version defines it
    
    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 #9171.
    f05d5888
Name
Last commit
Last update
..
calib3d Loading commit data...
core Loading commit data...
cudaarithm Loading commit data...
cudabgsegm Loading commit data...
cudacodec Loading commit data...
cudafeatures2d Loading commit data...
cudafilters Loading commit data...
cudaimgproc Loading commit data...
cudalegacy Loading commit data...
cudaobjdetect Loading commit data...
cudaoptflow Loading commit data...
cudastereo Loading commit data...
cudawarping Loading commit data...
cudev Loading commit data...
dnn Loading commit data...
features2d Loading commit data...
flann Loading commit data...
highgui Loading commit data...
imgcodecs Loading commit data...
imgproc Loading commit data...
java Loading commit data...
js Loading commit data...
ml Loading commit data...
objdetect Loading commit data...
photo Loading commit data...
python Loading commit data...
shape Loading commit data...
stitching Loading commit data...
superres Loading commit data...
ts Loading commit data...
video Loading commit data...
videoio Loading commit data...
videostab Loading commit data...
viz Loading commit data...
world Loading commit data...
CMakeLists.txt Loading commit data...