From 0c706eb08a984145ec75b016172cbbb39d47a9de Mon Sep 17 00:00:00 2001
From: Erwin Coumans
 <erwincoumans@erwincoumans-macbookpro2.roam.corp.google.com>
Date: Thu, 3 May 2018 09:06:30 -0700
Subject: [PATCH] fix some incompatibilities between
 google3/third_party/GL,EGL, glad

---
 examples/OpenGLWindow/EGLOpenGLWindow.cpp                 | 2 +-
 examples/OpenGLWindow/OpenGL2Include.h                    | 8 ++++++++
 examples/OpenGLWindow/OpenGLInclude.h                     | 7 ++++++-
 examples/OpenGLWindow/X11OpenGLWindow.cpp                 | 5 -----
 .../ThirdPartyLibs/Gwen/Renderers/OpenGL_DebugFont.cpp    | 6 ++++++
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/examples/OpenGLWindow/EGLOpenGLWindow.cpp b/examples/OpenGLWindow/EGLOpenGLWindow.cpp
index f8a7ab9c1..49d838907 100644
--- a/examples/OpenGLWindow/EGLOpenGLWindow.cpp
+++ b/examples/OpenGLWindow/EGLOpenGLWindow.cpp
@@ -38,7 +38,7 @@
 
 #include "OpenGLInclude.h"
 
-#include "third_party/GL/EGL/egl.h"
+#include "third_party/GL/gl/include/EGL/egl.h"
 #include "third_party/GL/gl/include/EGL/eglext.h"
 #include "third_party/GL/gl/include/GL/gl.h"
 
diff --git a/examples/OpenGLWindow/OpenGL2Include.h b/examples/OpenGLWindow/OpenGL2Include.h
index 8f75a649a..023223db5 100644
--- a/examples/OpenGLWindow/OpenGL2Include.h
+++ b/examples/OpenGLWindow/OpenGL2Include.h
@@ -17,12 +17,20 @@ subject to the following restrictions:
 #ifndef __OPENGL_INCLUDE_H
 #define __OPENGL_INCLUDE_H
 
+#ifdef BT_NO_GLAD
+#include "third_party/GL/gl/include/EGL/egl.h"
+#include "third_party/GL/gl/include/EGL/eglext.h"
+#include "third_party/GL/gl/include/GL/gl.h"
+#else
+
 #ifdef B3_USE_GLFW
 #include "glad/glad.h"
 #include <GLFW/glfw3.h>
 #else
 #include "glad/glad.h"
 #endif //B3_USE_GLFW
+#endif //BT_NO_GLAD
+
 //disable glGetError
 //#undef glGetError
 //#define glGetError MyGetError
diff --git a/examples/OpenGLWindow/OpenGLInclude.h b/examples/OpenGLWindow/OpenGLInclude.h
index 1eb284df7..84c7c446a 100644
--- a/examples/OpenGLWindow/OpenGLInclude.h
+++ b/examples/OpenGLWindow/OpenGLInclude.h
@@ -17,12 +17,17 @@ subject to the following restrictions:
 #ifndef __OPENGL_INCLUDE_H
 #define __OPENGL_INCLUDE_H
 
+#ifdef BT_NO_GLAD
+#include "third_party/GL/gl/include/EGL/egl.h"
+#include "third_party/GL/gl/include/EGL/eglext.h"
+#include "third_party/GL/gl/include/GL/gl.h"
+#else
 #ifdef B3_USE_GLFW
 #include <glad/glad.h>
 #include <GLFW/glfw3.h>
 #else
 #include "glad/glad.h"
 #endif //B3_USE_GLFW
-
+#endif //BT_NO_GLAD
 #endif //__OPENGL_INCLUDE_H
 
diff --git a/examples/OpenGLWindow/X11OpenGLWindow.cpp b/examples/OpenGLWindow/X11OpenGLWindow.cpp
index 3fcb51454..0bc347154 100644
--- a/examples/OpenGLWindow/X11OpenGLWindow.cpp
+++ b/examples/OpenGLWindow/X11OpenGLWindow.cpp
@@ -6,11 +6,6 @@
 
 #include<stdio.h>
 #include<stdlib.h>
-#ifdef GLEW_STATIC
-#include "glad/glad.h"
-#else
-#include <GL/glew.h>
-#endif//GLEW_STATIC
 
 #ifdef GLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS
 #include "glad/glad_glx.h"
diff --git a/examples/ThirdPartyLibs/Gwen/Renderers/OpenGL_DebugFont.cpp b/examples/ThirdPartyLibs/Gwen/Renderers/OpenGL_DebugFont.cpp
index e8e679516..89cc364d9 100644
--- a/examples/ThirdPartyLibs/Gwen/Renderers/OpenGL_DebugFont.cpp
+++ b/examples/ThirdPartyLibs/Gwen/Renderers/OpenGL_DebugFont.cpp
@@ -22,7 +22,13 @@
 #include "third_party/GL/gl/include/GL/gl.h"
 #include "third_party/GL/gl/include/GL/glext.h"
 #else
+
+#ifdef BT_NO_GLAD
 #include <GL/glew.h>
+#else
+#include "glad/glad.h"
+#endif
+
 #endif //NO_GLEW
 #endif //GLEW_STATIC
 #endif//(__APPLE__)