From c53f440fd9855b9261f5667fc7f1988690c33630 Mon Sep 17 00:00:00 2001
From: Janos Pantos <jp.uszeged@partner.samsung.com>
Date: Fri, 19 May 2017 20:39:01 +0200
Subject: [PATCH] Use GLES extension header for compilation

---
 renderdoc/driver/gl/CMakeLists.txt     | 1 +
 renderdoc/driver/gl/gl_common.h        | 3 +++
 renderdoc/driver/gl/official/glesext.h | 9 ++++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/renderdoc/driver/gl/CMakeLists.txt b/renderdoc/driver/gl/CMakeLists.txt
index 357923a63..877cb5aca 100644
--- a/renderdoc/driver/gl/CMakeLists.txt
+++ b/renderdoc/driver/gl/CMakeLists.txt
@@ -19,6 +19,7 @@ set(sources
     gl_shader_refl.cpp
     gl_shader_refl.h
     official/glcorearb.h
+    official/glesext.h
     official/glext.h
     wrappers/gl_buffer_funcs.cpp
     wrappers/gl_debug_funcs.cpp
diff --git a/renderdoc/driver/gl/gl_common.h b/renderdoc/driver/gl/gl_common.h
index 0e60cb1f2..c23ef890a 100644
--- a/renderdoc/driver/gl/gl_common.h
+++ b/renderdoc/driver/gl/gl_common.h
@@ -37,6 +37,9 @@
 // official headers
 #include "official/glcorearb.h"
 #include "official/glext.h"
+// TODO there are some extensions which are in both headers but with different content
+// however it does not seem to be a problem at this time
+#include "official/glesext.h"
 
 #if ENABLED(RDOC_WIN32)
 #include "official/wglext.h"
diff --git a/renderdoc/driver/gl/official/glesext.h b/renderdoc/driver/gl/official/glesext.h
index e7d305056..a590061f4 100644
--- a/renderdoc/driver/gl/official/glesext.h
+++ b/renderdoc/driver/gl/official/glesext.h
@@ -34,8 +34,15 @@ extern "C" {
 **   https://github.com/KhronosGroup/OpenGL-Registry
 */
 
+#ifndef GL_APIENTRY
+#define GL_APIENTRY
+#endif
+
+// TODO we use this hack, otherwise some typedefs may collide with the ones in glext.h
+// glext.h must be included before glesext.h
 #ifndef GL_APIENTRYP
-#define GL_APIENTRYP GL_APIENTRY*
+//#define GL_APIENTRYP GL_APIENTRY*
+#define GL_APIENTRYP APIENTRYP
 #endif
 
 /* Generated on date 20170425 */