diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-06 22:51:15 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-06 22:51:15 +0100 |
| commit | 12d1fc7a184f0ddaa97a88614905a04d6cf81f25 (patch) | |
| tree | 64caeae233c6919ad46923b1ab19c7e9c67b0369 | |
| parent | dc0d08cc9379abc190788fb494b798074b64134c (diff) | |
glad: Update to upstream 0.1.13a0
Upstreams the workaround we had to use for OSX.
| -rw-r--r-- | thirdparty/README.md | 10 | ||||
| -rw-r--r-- | thirdparty/glad/glad.c | 2 | ||||
| -rw-r--r-- | thirdparty/glad/glad/glad.h | 20 |
3 files changed, 22 insertions, 10 deletions
diff --git a/thirdparty/README.md b/thirdparty/README.md index 5b06abf25b..4dfd7b7466 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -31,6 +31,16 @@ Files extracted from upstream source: - `docs/{FTL.TXT,LICENSE.TXT}` +## glad + +- Upstream: https://github.com/Dav1dde/glad +- Version: 0.1.13a0 +- License: MIT + +The files we package are automatically generated. +See the header of glad.c for instructions on how to generate them for +the GLES version Godot targets. + ## glew - Upstream: http://glew.sourceforge.net diff --git a/thirdparty/glad/glad.c b/thirdparty/glad/glad.c index 6a708041ed..70a93f8d25 100644 --- a/thirdparty/glad/glad.c +++ b/thirdparty/glad/glad.c @@ -1,6 +1,6 @@ /* - OpenGL loader generated by glad 0.1.12a0 on Tue Nov 22 23:00:43 2016. + OpenGL loader generated by glad 0.1.13a0 on Fri Jan 6 19:27:07 2017. Language/Generator: C/C++ Specification: gl diff --git a/thirdparty/glad/glad/glad.h b/thirdparty/glad/glad/glad.h index 6daba88d62..e5eb22e297 100644 --- a/thirdparty/glad/glad/glad.h +++ b/thirdparty/glad/glad/glad.h @@ -1,6 +1,6 @@ /* - OpenGL loader generated by glad 0.1.12a0 on Tue Nov 22 23:00:43 2016. + OpenGL loader generated by glad 0.1.13a0 on Fri Jan 6 19:27:07 2017. Language/Generator: C/C++ Specification: gl @@ -150,24 +150,26 @@ typedef unsigned int GLhandleARB; typedef unsigned short GLhalfARB; typedef unsigned short GLhalf; typedef GLint GLfixed; -// Temporary work around for upstream issue: https://github.com/Dav1dde/glad/issues/70 -// Originally fixed by Algorithmus, reapplied in master -#if defined(__APPLE__) +#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1060) typedef long GLintptr; -typedef long GLsizeiptr; #else typedef ptrdiff_t GLintptr; +#endif +#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1060) +typedef long GLsizeiptr; +#else typedef ptrdiff_t GLsizeiptr; #endif typedef int64_t GLint64; typedef uint64_t GLuint64; -// Temporary work around for upstream issue: https://github.com/Dav1dde/glad/issues/70 -// Originally fixed by Algorithmus, reapplied in master -#if defined(__APPLE__) +#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1060) typedef long GLintptrARB; -typedef long GLsizeiptrARB; #else typedef ptrdiff_t GLintptrARB; +#endif +#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1060) +typedef long GLsizeiptrARB; +#else typedef ptrdiff_t GLsizeiptrARB; #endif typedef int64_t GLint64EXT; |