diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-09-05 15:47:26 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-09-10 14:54:28 +0000 |
| commit | 7373929d6831358c3d0c1556bd94da9310c1cb92 (patch) | |
| tree | 4edc9668d4ecdf5badaa0c334e27596fac17cb48 /src | |
| parent | 103ffa117d3008cf0f73437aa09c1550ea799576 (diff) | |
Fix missing GL function protos with newer GLES headers
A recent ANGLE update added GL_GLEXT_PROTOTYPES for gl2.h. That was
a good first step, but we need this for gl3.h and gl31.h as well,
because once one upgrades to a newer EGL/GLES capable build of Mesa,
the same problem will surface.
Change-Id: I138ae32e3461dc87bf789aa641359ae46c0ec170
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/opengl/qopengl.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h index e2408d0047..c7a3e79666 100644 --- a/src/gui/opengl/qopengl.h +++ b/src/gui/opengl/qopengl.h @@ -95,14 +95,15 @@ typedef void* GLeglImageOES; // applications cannot target ES 3. Therefore QOpenGLFunctions and // friends do everything dynamically and never rely on these macros. +# ifndef GL_GLEXT_PROTOTYPES +# define GL_GLEXT_PROTOTYPES +# endif + # if defined(QT_OPENGL_ES_3_1) # include <GLES3/gl31.h> # elif defined(QT_OPENGL_ES_3) # include <GLES3/gl3.h> # else -# ifndef GL_GLEXT_PROTOTYPES -# define GL_GLEXT_PROTOTYPES -# endif # include <GLES2/gl2.h> #endif |