From 55d425807f6f1784d6ffd84586ae7efd77c1b352 Mon Sep 17 00:00:00 2001 From: BastiaanOlij Date: Wed, 4 Jan 2017 21:56:56 +1100 Subject: First set of changes to fix compilation errors and initialise the gles3 renderer for Mac OS X. Still broken at this point. --- drivers/gl_context/glad/glad.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'drivers/gl_context') 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; -- cgit v1.2.3