diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-05 08:37:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-05 08:37:06 +0100 |
| commit | e39a6242ac1c503a3c35f40c8a44296fa9df28cb (patch) | |
| tree | 2679fbc9347eb5096a3e04ee1152db8654ecbea1 /drivers/gl_context | |
| parent | d8e54b1e2620be99a3f1fdc7df11009f5a107eaa (diff) | |
| parent | 5e717ed8a38dee1b6c722ad0827a764d45089cdb (diff) | |
Merge pull request #7429 from BastiaanOlij/glew3-osx
Fixing compilation errors for gles3 for Mac OS X
Diffstat (limited to 'drivers/gl_context')
| -rw-r--r-- | drivers/gl_context/glad/glad.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/gl_context/glad/glad.h b/drivers/gl_context/glad/glad.h index 7bb465f0ec..3653abe71a 100644 --- a/drivers/gl_context/glad/glad.h +++ b/drivers/gl_context/glad/glad.h @@ -150,12 +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__) +typedef long GLintptr; +typedef long GLsizeiptr; +#else typedef ptrdiff_t GLintptr; 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__) +typedef long GLintptrARB; +typedef long GLsizeiptrARB; +#else typedef ptrdiff_t GLintptrARB; typedef ptrdiff_t GLsizeiptrARB; +#endif typedef int64_t GLint64EXT; typedef uint64_t GLuint64EXT; typedef struct __GLsync *GLsync; |