X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=dispatch%2Fglimports.hpp;h=9a71a448e084d1f9ff963c3634c0bd23a710adcb;hb=3892c3075d6ec80d69570dceddcdd1f67abfc04a;hp=773d50f4914a23c3e6a07a7e743dc01f5cd04888;hpb=e7cb2b98575d5ff3801bd3527a648e0dbfdebdad;p=apitrace

diff --git a/dispatch/glimports.hpp b/dispatch/glimports.hpp
index 773d50f..9a71a44 100644
--- a/dispatch/glimports.hpp
+++ b/dispatch/glimports.hpp
@@ -46,6 +46,14 @@
 #include <GL/glext.h>
 
 
+// Windows 8 GL headers define GL_EXT_paletted_texture but not
+// GL_TEXTURE_INDEX_SIZE_EXT, and due to the way we include DirectX headers, it
+// ends up taking precedence over the ones we bundle...
+#if defined(GL_EXT_paletted_texture) && !defined(GL_TEXTURE_INDEX_SIZE_EXT)
+#define GL_TEXTURE_INDEX_SIZE_EXT 0x80ED
+#endif
+
+
 // GL_NVX_gpu_memory_info
 #define GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX          0x9047
 #define GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX    0x9048
@@ -80,9 +88,27 @@ typedef struct _WGLSWAP
 
 #elif defined(__APPLE__)
 
+#include <TargetConditionals.h>
+
+#if TARGET_OS_IPHONE
+#elif TARGET_OS_MAC
 #include <OpenGL/OpenGL.h>
+
+#include <AvailabilityMacros.h>
+
+#ifndef MAC_OS_X_VERSION_10_6
+#define MAC_OS_X_VERSION_10_6 1060
+#endif
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
 #include <OpenGL/CGLIOSurface.h>
 #include <OpenGL/CGLDevice.h>
+#else
+#define kCGLPFAAcceleratedCompute 97
+#define kCGLRPAcceleratedCompute 130
+typedef void *CGLShareGroupObj;
+typedef struct __IOSurface *IOSurfaceRef;
+#endif
 
 #ifndef CGL_VERSION_1_3
 #define kCGLPFAOpenGLProfile 99
@@ -102,6 +128,7 @@ CGLError CGLGetSurface(CGLContextObj ctx, CGSConnectionID* cid, CGSWindowID* wid
 CGLError CGLUpdateContext(CGLContextObj ctx);
 
 }
+#endif
 
 #else