godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glad: Update to upstream 0.1.13a0 

Upstreams the workaround we had to use for OSX.
This commit is contained in:
Rémi Verschelde 2017-01-06 22:51:15 +01:00
parent dc0d08cc93
commit 12d1fc7a18
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
thirdparty/README.md vendored
View File

@ -31,6 +31,16 @@ Files extracted from upstream source:
- `docs/{FTL.TXT,LICENSE.TXT}` - `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 ## glew
- Upstream: http://glew.sourceforge.net - Upstream: http://glew.sourceforge.net

2
thirdparty/glad/glad.c vendored
View File

@ -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++ Language/Generator: C/C++
Specification: gl Specification: gl

20
thirdparty/glad/glad/glad.h vendored
View File

@ -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++ Language/Generator: C/C++
Specification: gl Specification: gl
@ -150,24 +150,26 @@ typedef unsigned int GLhandleARB;
typedef unsigned short GLhalfARB; typedef unsigned short GLhalfARB;
typedef unsigned short GLhalf; typedef unsigned short GLhalf;
typedef GLint GLfixed; typedef GLint GLfixed;
// Temporary work around for upstream issue: https://github.com/Dav1dde/glad/issues/70 #if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1060)
// Originally fixed by Algorithmus, reapplied in master
#if defined(__APPLE__)
typedef long GLintptr; typedef long GLintptr;
typedef long GLsizeiptr;
#else #else
typedef ptrdiff_t GLintptr; 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; typedef ptrdiff_t GLsizeiptr;
#endif #endif
typedef int64_t GLint64; typedef int64_t GLint64;
typedef uint64_t GLuint64; typedef uint64_t GLuint64;
// Temporary work around for upstream issue: https://github.com/Dav1dde/glad/issues/70 #if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1060)
// Originally fixed by Algorithmus, reapplied in master
#if defined(__APPLE__)
typedef long GLintptrARB; typedef long GLintptrARB;
typedef long GLsizeiptrARB;
#else #else
typedef ptrdiff_t GLintptrARB; 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; typedef ptrdiff_t GLsizeiptrARB;
#endif #endif
typedef int64_t GLint64EXT; typedef int64_t GLint64EXT;