mirror of
https://github.com/opencv/opencv.git
synced 2024-11-29 05:29:54 +08:00
f05d5888c9
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. |
||
|---|---|---|
| .. | ||
| doc/pics | ||
| include/opencv2 | ||
| misc/java | ||
| src | ||
| test | ||
| CMakeLists.txt | ||