glad: omit KHR

ocornut · Sep 23, 2019 · 84e8abb · 84e8abb
1 parent 978b7f4
commit 84e8abb
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 297 deletions.
diff --git a/examples/libs/glad/include/KHR/khrplatform.h b/examples/libs/glad/include/KHR/khrplatform.h
diff --git a/examples/libs/glad/include/glad/glad.h b/examples/libs/glad/include/glad/glad.h
@@ -1,6 +1,6 @@
 /*
 
-    OpenGL loader generated by glad 0.1.33 on Wed Sep  4 22:12:07 2019.
+    OpenGL loader generated by glad 0.1.33 on Mon Sep 23 11:00:50 2019.
 
     Language/Generator: C/C++
     Specification: gl
@@ -10,11 +10,11 @@
         
     Loader: True
     Local files: False
-    Omit khrplatform: False
+    Omit khrplatform: True
     Reproducible: False
 
     Commandline:
-        --profile="core" --api="gl=3.3" --generator="c" --spec="gl" --extensions=""
+        --profile="core" --api="gl=3.3" --generator="c" --spec="gl" --omit-khrplatform --extensions=""
     Online:
         https://glad.dav1d.de/#profile=core&language=c&specification=gl&loader=on&api=gl%3D3.3
 */
@@ -86,7 +86,6 @@ GLAPI int gladLoadGL(void);
 
 GLAPI int gladLoadGLLoader(GLADloadproc);
 
-#include <KHR/khrplatform.h>
 typedef unsigned int GLenum;
 typedef unsigned char GLboolean;
 typedef unsigned int GLbitfield;
@@ -115,10 +114,58 @@ typedef unsigned int GLhandleARB;
 typedef khronos_uint16_t GLhalf;
 typedef khronos_uint16_t GLhalfARB;
 typedef khronos_int32_t GLfixed;
+#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1060)
+#if defined(__khrplatform_h_)
 typedef khronos_intptr_t GLintptr;
+#else
+typedef long GLintptr;
+#endif
+#else
+#if defined(__khrplatform_h_)
+typedef khronos_intptr_t GLintptr;
+#else
+typedef ptrdiff_t GLintptr;
+#endif
+#endif
+#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1060)
+#if defined(__khrplatform_h_)
 typedef khronos_intptr_t GLintptrARB;
+#else
+typedef long GLintptrARB;
+#endif
+#else
+#if defined(__khrplatform_h_)
+typedef khronos_intptr_t GLintptrARB;
+#else
+typedef ptrdiff_t GLintptrARB;
+#endif
+#endif
+#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1060)
+#if defined(__khrplatform_h_)
 typedef khronos_ssize_t GLsizeiptr;
+#else
+typedef long GLsizeiptr;
+#endif
+#else
+#if defined(__khrplatform_h_)
+typedef khronos_ssize_t GLsizeiptr;
+#else
+typedef ptrdiff_t GLsizeiptr;
+#endif
+#endif
+#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1060)
+#if defined(__khrplatform_h_)
 typedef khronos_ssize_t GLsizeiptrARB;
+#else
+typedef long GLsizeiptrARB;
+#endif
+#else
+#if defined(__khrplatform_h_)
+typedef khronos_ssize_t GLsizeiptrARB;
+#else
+typedef ptrdiff_t GLsizeiptrARB;
+#endif
+#endif
 typedef khronos_int64_t GLint64;
 typedef khronos_int64_t GLint64EXT;
 typedef khronos_uint64_t GLuint64;