X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=sidebyside;f=glimports.hpp;h=773d50f4914a23c3e6a07a7e743dc01f5cd04888;hb=ad60fd108d331796173ad54356855d9a2d0d87ba;hp=e8d2c5c6036f86e06fe291090a8ac84f6e2e90c0;hpb=4a826ed267c580a0f5e803ff7f05710c9d135b70;p=apitrace

diff --git a/glimports.hpp b/glimports.hpp
index e8d2c5c..773d50f 100644
--- a/glimports.hpp
+++ b/glimports.hpp
@@ -30,33 +30,33 @@
 #ifndef _GLIMPORTS_HPP_
 #define _GLIMPORTS_HPP_
 
-#ifdef WIN32
 
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN 1
-#endif
-
-#include <windows.h>
-
-#else /* !WIN32 */
+#if defined(_WIN32)
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN 1
+#  endif
+#  include <windows.h>
+#elif defined(__APPLE__)
+#elif defined(HAVE_X11)
+#  include <X11/Xlib.h>
+#endif /* !_WIN32 */
 
-#include <X11/Xlib.h>
-
-#endif /* !WIN32 */
 
 #include <GL/gl.h>
-
 #include <GL/glext.h>
 
-#ifndef GL_TEXTURE_INDEX_SIZE_EXT
-#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
-#endif
 
-#ifdef WIN32
+// GL_NVX_gpu_memory_info
+#define GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX          0x9047
+#define GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX    0x9048
+#define GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX  0x9049
+#define GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX            0x904A
+#define GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX            0x904B
 
-#include <GL/wglext.h>
 
-#define GLAPIENTRY __stdcall
+#if defined(_WIN32)
+
+#include <GL/wglext.h>
 
 #ifndef PFD_SUPPORT_DIRECTDRAW
 #define PFD_SUPPORT_DIRECTDRAW 0x00002000
@@ -65,8 +65,9 @@
 #define PFD_SUPPORT_COMPOSITION 0x00008000
 #endif
 
-#ifdef __MINGW32__
+#ifndef WGL_SWAPMULTIPLE_MAX
 
+extern "C"
 typedef struct _WGLSWAP
 {
     HDC hdc;
@@ -75,13 +76,47 @@ typedef struct _WGLSWAP
 
 #define WGL_SWAPMULTIPLE_MAX 16
 
-#endif /* __MINGW32__ */
+#endif /* !WGL_SWAPMULTIPLE_MAX */
+
+#elif defined(__APPLE__)
+
+#include <OpenGL/OpenGL.h>
+#include <OpenGL/CGLIOSurface.h>
+#include <OpenGL/CGLDevice.h>
+
+#ifndef CGL_VERSION_1_3
+#define kCGLPFAOpenGLProfile 99
+#define kCGLOGLPVersion_Legacy 0x1000
+#define kCGLOGLPVersion_3_2_Core 0x3200
+#endif
+
+extern "C" {
+
+// From http://www.opensource.apple.com/source/gdb/gdb-954/libcheckpoint/cpcg.c
+typedef void * CGSConnectionID;
+typedef int CGSWindowID;
+typedef int CGSSurfaceID;
 
-#else /* !WIN32 */
+CGLError CGLSetSurface(CGLContextObj ctx, CGSConnectionID cid, CGSWindowID wid, CGSSurfaceID sid);
+CGLError CGLGetSurface(CGLContextObj ctx, CGSConnectionID* cid, CGSWindowID* wid, CGSSurfaceID* sid);
+CGLError CGLUpdateContext(CGLContextObj ctx);
 
+}
+
+#else
+
+#ifdef HAVE_X11
 #include <GL/glx.h>
-#include <GL/glext.h>
+#include <GL/glxext.h>
+#endif
+
+/* Prevent collision with trace::Bool */
+#undef Bool
+
+#endif
+
+
+#include "eglimports.hpp"
 
-#endif /* !WIN32 */
 
 #endif /* _GLIMPORTS_HPP_ */