• 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
..
doc/pics Loading commit data...
include/opencv2 Loading commit data...
misc/java Loading commit data...
src Loading commit data...
test Loading commit data...
CMakeLists.txt Loading commit data...