Fix build break with latest OpenGLES Khronos header.

 - reference: https://www.opengl.org/registry/ABI/#5

Change-Id: I8e107e8dcfbfe41ca64e8523753f06c11588f827

diff --git a/config.tests/qpa/eglfs-brcm/eglfs-brcm.cpp b/config.tests/qpa/eglfs-brcm/eglfs-brcm.cpp
index a97fb510c71081fdb691e5e90df85d03355ef3c2..894f49a20a185a8863c6f755b2c906d2763c6002 100644 (file)
--- a/config.tests/qpa/eglfs-brcm/eglfs-brcm.cpp
+++ b/config.tests/qpa/eglfs-brcm/eglfs-brcm.cpp
@@ -32,6 +32,8 @@
 ****************************************************************************/
 
 #include <EGL/egl.h>
+
+#define GL_GLEXT_PROTOTYPES
 #include <GLES2/gl2.h>
 #include <bcm_host.h>
 

diff --git a/config.tests/qpa/eglfs-mali/eglfs-mali.cpp b/config.tests/qpa/eglfs-mali/eglfs-mali.cpp
index 8c1d33308d86e72b74b9dbe50904bffe1a13f046..16ea61e68c9e04eed5d5547e1f6c55e51827b1a6 100644 (file)
--- a/config.tests/qpa/eglfs-mali/eglfs-mali.cpp
+++ b/config.tests/qpa/eglfs-mali/eglfs-mali.cpp
@@ -33,6 +33,7 @@
 
 #include <EGL/fbdev_window.h>
 #include <EGL/egl.h>
+#define GL_GLEXT_PROTOTYPES
 #include <GLES2/gl2.h>
 
 int main(int, char **)

diff --git a/config.tests/qpa/eglfs-viv/eglfs-viv.cpp b/config.tests/qpa/eglfs-viv/eglfs-viv.cpp
index 7b5b02541b83e2dc135d0697a7ade710ffe3b662..1d983a5bec38c712462b10efad42db9c3d627349 100644 (file)
--- a/config.tests/qpa/eglfs-viv/eglfs-viv.cpp
+++ b/config.tests/qpa/eglfs-viv/eglfs-viv.cpp
@@ -33,6 +33,7 @@
 
 #include <EGL/egl.h>
 #include <EGL/eglvivante.h>
+#define GL_GLEXT_PROTOTYPES
 #include <GLES2/gl2.h>
 
 int main(int, char **)

diff --git a/config.tests/qpa/kms/kms.cpp b/config.tests/qpa/kms/kms.cpp
index 64c11158c5f03113fbb916aafd8ca349c2bfb373..bba73ce8033cead0759d4ce3c37111dd4d1b28c2 100644 (file)
--- a/config.tests/qpa/kms/kms.cpp
+++ b/config.tests/qpa/kms/kms.cpp
@@ -38,6 +38,7 @@ extern "C" {
 #include <xf86drm.h>
 }
 #include <EGL/egl.h>
+#define GL_GLEXT_PROTOTYPES
 #include <GLES2/gl2.h>
 
 int main(int, char **)

diff --git a/config.tests/unix/opengles2/opengles2.cpp b/config.tests/unix/opengles2/opengles2.cpp
index b3b9be6d4921ff827c952d18956f01d0ef1b0c16..81926f3ee41534b504040aeba4ef7fa6c76d239d 100644 (file)
--- a/config.tests/unix/opengles2/opengles2.cpp
+++ b/config.tests/unix/opengles2/opengles2.cpp
@@ -34,6 +34,7 @@
 #ifdef BUILD_ON_MAC
   #include <OpenGLES/ES2/gl.h>
 #else
+  #define GL_GLEXT_PROTOTYPES
   #include <GLES2/gl2.h>
 #endif
 

diff --git a/src/3rdparty/angle/include/angle_gl.h b/src/3rdparty/angle/include/angle_gl.h
index e7ecdbd2f0a55e7b332f89c0d19dbb60113774f0..0995d660db0ddfc9b9a199df7f2d81a99cdee325 100644 (file)
--- a/src/3rdparty/angle/include/angle_gl.h
+++ b/src/3rdparty/angle/include/angle_gl.h
@@ -10,6 +10,7 @@
 #ifndef ANGLEGL_H_
 #define ANGLEGL_H_
 
+#define GL_GLEXT_PROTOTYPES
 #include "GLES2/gl2.h"
 #include "GLES2/gl2ext.h"
 #include "GLES3/gl3.h"

diff --git a/src/3rdparty/angle/src/libANGLE/Config.h b/src/3rdparty/angle/src/libANGLE/Config.h
index aed8aedb1d90a1c30636f02c3b48dfcc639bd5f2..3bd8115775140a603f748ac78e4a0da26ed3fe92 100644 (file)
--- a/src/3rdparty/angle/src/libANGLE/Config.h
+++ b/src/3rdparty/angle/src/libANGLE/Config.h
@@ -16,6 +16,7 @@
 #include "common/angleutils.h"
 
 #include <EGL/egl.h>
+#define GL_GLEXT_PROTOTYPES
 #include <GLES2/gl2.h>
 
 #include <map>

diff --git a/src/3rdparty/angle/src/libANGLE/Program.h b/src/3rdparty/angle/src/libANGLE/Program.h
index 38fc83d29dc0efd83ae213409fd5a3d166738e45..15a04927f3c65c9642b8bac791510424262e3eac 100644 (file)
--- a/src/3rdparty/angle/src/libANGLE/Program.h
+++ b/src/3rdparty/angle/src/libANGLE/Program.h
@@ -17,6 +17,7 @@
 
 #include "common/angleutils.h"
 
+#define GL_GLEXT_PROTOTYPES
 #include <GLES2/gl2.h>
 #include <GLSLANG/ShaderLang.h>
 

diff --git a/src/3rdparty/angle/src/libANGLE/renderer/Image.h b/src/3rdparty/angle/src/libANGLE/renderer/Image.h
index 62d854c9b6b4a0807aee21c07d41826b4c6f346f..1bb3fff7632de03c76adb711299ca7487b34ec67 100644 (file)
--- a/src/3rdparty/angle/src/libANGLE/renderer/Image.h
+++ b/src/3rdparty/angle/src/libANGLE/renderer/Image.h
@@ -14,6 +14,7 @@
 #include "common/debug.h"
 #include "libANGLE/Error.h"
 
+#define GL_GLEXT_PROTOTYPES
 #include <GLES2/gl2.h>
 
 namespace gl

diff --git a/src/3rdparty/angle/src/libANGLE/renderer/QueryImpl.h b/src/3rdparty/angle/src/libANGLE/renderer/QueryImpl.h
index bed63ea1b0a45eb43aed813f98b15f8a7ba98c49..0489825ecad292c87093c26486b89be833856ced 100644 (file)
--- a/src/3rdparty/angle/src/libANGLE/renderer/QueryImpl.h
+++ b/src/3rdparty/angle/src/libANGLE/renderer/QueryImpl.h
@@ -13,6 +13,7 @@
 
 #include "common/angleutils.h"
 
+#define GL_GLEXT_PROTOTYPES
 #include <GLES2/gl2.h>
 
 namespace rx

diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/IndexDataManager.h b/src/3rdparty/angle/src/libANGLE/renderer/d3d/IndexDataManager.h
index 275b3720c53ef932434a5a498713a3fad92022bd..39b7f2a9915bdc2d91d19ae0bedce2bb272f5afa 100644 (file)
--- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/IndexDataManager.h
+++ b/src/3rdparty/angle/src/libANGLE/renderer/d3d/IndexDataManager.h
@@ -10,6 +10,7 @@
 #ifndef LIBANGLE_INDEXDATAMANAGER_H_
 #define LIBANGLE_INDEXDATAMANAGER_H_
 
+#define GL_GLEXT_PROTOTYPES
 #include <GLES2/gl2.h>
 
 #include "common/angleutils.h"

diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/SwapChainD3D.h b/src/3rdparty/angle/src/libANGLE/renderer/d3d/SwapChainD3D.h
index da36e52ea7831e817ffbdc6bec9f9162ef3369b8..cea5eab7c2d180a997f593ec46e4af8622744601 100644 (file)
--- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/SwapChainD3D.h
+++ b/src/3rdparty/angle/src/libANGLE/renderer/d3d/SwapChainD3D.h
@@ -10,6 +10,7 @@
 #ifndef LIBANGLE_RENDERER_D3D_SWAPCHAIND3D_H_
 #define LIBANGLE_RENDERER_D3D_SWAPCHAIND3D_H_
 
+#define GL_GLEXT_PROTOTYPES
 #include <GLES2/gl2.h>
 #include <EGL/egl.h>
 

diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/TextureStorage.h b/src/3rdparty/angle/src/libANGLE/renderer/d3d/TextureStorage.h
index ae2d42ca8af733f739fc154ad0dbd5dd3104af43..9646acf4afbc0ab99256b7195755bd864132d9cf 100644 (file)
--- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/TextureStorage.h
+++ b/src/3rdparty/angle/src/libANGLE/renderer/d3d/TextureStorage.h
@@ -14,6 +14,7 @@
 #include "common/debug.h"
 #include "libANGLE/Error.h"
 
+#define GL_GLEXT_PROTOTYPES
 #include <GLES2/gl2.h>
 #include <stdint.h>
 

diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/VertexBuffer.h b/src/3rdparty/angle/src/libANGLE/renderer/d3d/VertexBuffer.h
index 5cb03fe3a14a8ed32eb5a79ea00cd1b3f2d689dd..2732e57c2593d344f2e89ac0c49f1df74146d518 100644 (file)
--- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/VertexBuffer.h
+++ b/src/3rdparty/angle/src/libANGLE/renderer/d3d/VertexBuffer.h
@@ -13,6 +13,7 @@
 #include "common/angleutils.h"
 #include "libANGLE/Error.h"
 
+#define GL_GLEXT_PROTOTYPES
 #include <GLES2/gl2.h>
 
 #include <cstddef>

diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.h b/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.h
index 2c94c57595d17d4571f9fd869ab42d9278ddd859..7d53f47bf62eb089dedb57ed49d404f729d5deaf 100644 (file)
--- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.h
+++ b/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.h
@@ -14,6 +14,7 @@
 #include "libANGLE/Error.h"
 #include "common/angleutils.h"
 
+#define GL_GLEXT_PROTOTYPES
 #include <GLES2/gl2.h>
 
 #include <cstddef>

diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.h b/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.h
index 1672121ec7f326a157629d049c94ceb198240b26..4e839d73a8bc34a3dda91702bf7720979874a1bd 100644 (file)
--- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.h
+++ b/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/PixelTransfer11.h
@@ -15,6 +15,7 @@
 
 #include "common/platform.h"
 
+#define GL_GLEXT_PROTOTYPES
 #include <GLES2/gl2.h>
 
 #include <map>

diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d9/Blit9.h b/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d9/Blit9.h
index 586abd2580ad713413abe03b7e97453cddb10d3f..d628fe0043ee9dd5196d85f5f15f96b22bd92f97 100644 (file)
--- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d9/Blit9.h
+++ b/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d9/Blit9.h
@@ -12,6 +12,7 @@
 #include "common/angleutils.h"
 #include "libANGLE/Error.h"
 
+#define GL_GLEXT_PROTOTYPES
 #include <GLES2/gl2.h>
 
 namespace gl

diff --git a/src/3rdparty/angle/src/libANGLE/validationES.h b/src/3rdparty/angle/src/libANGLE/validationES.h
index b0ccd8eecce31780a89e63423d3e468bb70c520f..dd4a56ae3efd5c72f85f837829fe7b54b82a1320 100644 (file)
--- a/src/3rdparty/angle/src/libANGLE/validationES.h
+++ b/src/3rdparty/angle/src/libANGLE/validationES.h
@@ -11,6 +11,7 @@
 
 #include "common/mathutil.h"
 
+#define GL_GLEXT_PROTOTYPES
 #include <GLES2/gl2.h>
 #include <GLES3/gl3.h>
 

diff --git a/src/3rdparty/angle/src/libANGLE/validationES2.h b/src/3rdparty/angle/src/libANGLE/validationES2.h
index b9c1fd3bc40d178fe7545993e0ce1db41a6b2846..f926edf0634af6937350421d68ad14ba2635a310 100644 (file)
--- a/src/3rdparty/angle/src/libANGLE/validationES2.h
+++ b/src/3rdparty/angle/src/libANGLE/validationES2.h
@@ -9,6 +9,7 @@
 #ifndef LIBANGLE_VALIDATION_ES2_H_
 #define LIBANGLE_VALIDATION_ES2_H_
 
+#define GL_GLEXT_PROTOTYPES
 #include <GLES2/gl2.h>
 
 namespace gl

diff --git a/src/3rdparty/angle/src/libGLESv2/entry_points_gles_2_0.h b/src/3rdparty/angle/src/libGLESv2/entry_points_gles_2_0.h
index eee5fb54681b2ce6fda9f10c1355cb9d6fa929b8..285ba7793f264051489a09fb953384b8487dec5b 100644 (file)
--- a/src/3rdparty/angle/src/libGLESv2/entry_points_gles_2_0.h
+++ b/src/3rdparty/angle/src/libGLESv2/entry_points_gles_2_0.h
@@ -9,6 +9,7 @@
 #ifndef LIBGLESV2_ENTRYPOINTGLES20_H_
 #define LIBGLESV2_ENTRYPOINTGLES20_H_
 
+#define GL_GLEXT_PROTOTYPES
 #include <GLES2/gl2.h>
 #include <export.h>
 

diff --git a/src/3rdparty/angle/src/libGLESv2/entry_points_gles_2_0_ext.h b/src/3rdparty/angle/src/libGLESv2/entry_points_gles_2_0_ext.h
index 816519fe1f5fb933fd4d7a075c2898bce3ecc0c7..fecfe6692b9796d9ebd74c33b089843c04240d71 100644 (file)
--- a/src/3rdparty/angle/src/libGLESv2/entry_points_gles_2_0_ext.h
+++ b/src/3rdparty/angle/src/libGLESv2/entry_points_gles_2_0_ext.h
@@ -9,6 +9,7 @@
 #ifndef LIBGLESV2_ENTRYPOINTGLES20EXT_H_
 #define LIBGLESV2_ENTRYPOINTGLES20EXT_H_
 
+#define GL_GLEXT_PROTOTYPES
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <export.h>

diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h
index 87dc2a830e89409d12bc56bf2cb9ecff82aac024..9bd56679fbc5e5cf97ba19f60fe67715f41b72a4 100644 (file)
--- a/src/gui/opengl/qopengl.h
+++ b/src/gui/opengl/qopengl.h
@@ -89,6 +89,7 @@ typedef void* GLeglImageOES;
 // applications cannot target ES 3. Therefore QOpenGLFunctions and
 // friends do everything dynamically and never rely on these macros.
 
+#define GL_GLEXT_PROTOTYPES
 #  if defined(QT_OPENGL_ES_3_1)
 #   include <GLES3/gl31.h>
 #  elif defined(QT_OPENGL_ES_3)

diff --git a/src/plugins/platforms/openwfd/qopenwfddevice.h b/src/plugins/platforms/openwfd/qopenwfddevice.h
index 2053414c5431a490830aa399e450c7a880817115..de4641c21b8cb7feac29703abfd28d0c4f0564af 100644 (file)
--- a/src/plugins/platforms/openwfd/qopenwfddevice.h
+++ b/src/plugins/platforms/openwfd/qopenwfddevice.h
@@ -45,6 +45,7 @@
 #include <gbm.h>
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
+#define GL_GLEXT_PROTOTYPES
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 

diff --git a/src/plugins/platforms/openwfd/qopenwfdoutputbuffer.h b/src/plugins/platforms/openwfd/qopenwfdoutputbuffer.h
index 36cd5c4caee1b28d35805b300316fbdcb74a621d..3552c0a5d0814b4449c4aa264593e040f4cb8792 100644 (file)
--- a/src/plugins/platforms/openwfd/qopenwfdoutputbuffer.h
+++ b/src/plugins/platforms/openwfd/qopenwfdoutputbuffer.h
@@ -37,6 +37,7 @@
 #include "qopenwfdport.h"
 
 #include <EGL/egl.h>
+#define GL_GLEXT_PROTOTYPES
 #include <GLES2/gl2.h>
 
 class QOpenWFDOutputBuffer

diff --git a/tests/auto/cmake/test_opengl_lib/main.cpp b/tests/auto/cmake/test_opengl_lib/main.cpp
index de40d1a3e949492795f179972915c0a8b5bdd114..936710e11695c12677b6ce27531cf2ffdc46e003 100644 (file)
--- a/tests/auto/cmake/test_opengl_lib/main.cpp
+++ b/tests/auto/cmake/test_opengl_lib/main.cpp
@@ -35,6 +35,7 @@
 #include <qglobal.h>
 #ifndef QT_OPENGL_DYNAMIC
 #  if defined(GL_IMPLEMENTATION_GLES2)
+#    define GL_GLEXT_PROTOTYPES
 #    include <GLES2/gl2.h>
 #  elif defined(GL_IMPLEMENTATION_GL)
 #    ifdef Q_OS_WIN