From: Mun, Gwan-gyeong <kk.moon@samsung.com>
Date: Mon, 23 May 2016 03:24:25 +0000 (+0900)
Subject: Fix build break with latest OpenGLES Khronos header.
X-Git-Tag: submit/tizen_common/20160530.124515^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F39%2F70839%2F1;p=platform%2Fupstream%2Fqtbase.git

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 a97fb510c7..894f49a20a 100644
--- 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 8c1d33308d..16ea61e68c 100644
--- 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 7b5b02541b..1d983a5bec 100644
--- 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 64c11158c5..bba73ce803 100644
--- 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 b3b9be6d49..81926f3ee4 100644
--- 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 e7ecdbd2f0..0995d660db 100644
--- 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 aed8aedb1d..3bd8115775 100644
--- 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 38fc83d29d..15a04927f3 100644
--- 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 62d854c9b6..1bb3fff763 100644
--- 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 bed63ea1b0..0489825eca 100644
--- 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 275b3720c5..39b7f2a991 100644
--- 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 da36e52ea7..cea5eab7c2 100644
--- 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 ae2d42ca8a..9646acf4af 100644
--- 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 5cb03fe3a1..2732e57c25 100644
--- 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 2c94c57595..7d53f47bf6 100644
--- 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 1672121ec7..4e839d73a8 100644
--- 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 586abd2580..d628fe0043 100644
--- 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 b0ccd8eecc..dd4a56ae3e 100644
--- 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 b9c1fd3bc4..f926edf063 100644
--- 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 eee5fb5468..285ba7793f 100644
--- 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 816519fe1f..fecfe6692b 100644
--- 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 87dc2a830e..9bd56679fb 100644
--- 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 2053414c54..de4641c21b 100644
--- 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 36cd5c4cae..3552c0a5d0 100644
--- 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 de40d1a3e9..936710e116 100644
--- 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