Merge branch 'master' into on-demand-loading

[apitrace] / glimports.hpp

diff --git a/glimports.hpp b/glimports.hpp
index 720e48a105b93bb54563b8dfcc951386118fcb9d..dce248a2649bc87caf721f2d7db8243595871c2f 100644 (file)
--- a/glimports.hpp
+++ b/glimports.hpp
@@ -30,34 +30,43 @@
 #ifndef _GLIMPORTS_HPP_
 #define _GLIMPORTS_HPP_
 
-#ifdef _WIN32
+
+// Prevent including system's glext.h
+#define __glext_h_
+
+
+#if defined(_WIN32)
 
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN 1
 #endif
 
 #include <windows.h>
+#include <GL/gl.h>
+
+#elif defined(__APPLE__)
 
-#else /* !_WIN32 */
+#include <OpenGL/gl.h>
+
+#else
 
 #include <X11/Xlib.h>
+#include <GL/gl.h>
 
 #endif /* !_WIN32 */
 
-// Prevent including system's glext.h
-#define __glext_h_
-
-#include <GL/gl.h>
 
+// Include our own glext.h
 #undef __glext_h_
-
 #include "glext/glext.h"
 
+
 #ifndef GL_TEXTURE_INDEX_SIZE_EXT
 #define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
 #endif
 
-#ifdef _WIN32
+
+#if defined(_WIN32)
 
 #include "glext/wglext.h"
 
@@ -83,7 +92,25 @@ typedef struct _WGLSWAP
 
 #endif /* !WGL_SWAPMULTIPLE_MAX */
 
-#else /* !_WIN32 */
+#elif defined(__APPLE__)
+
+#include <OpenGL/OpenGL.h>
+#include <OpenGL/CGLIOSurface.h>
+#include <OpenGL/CGLDevice.h>
+
+extern "C" {
+
+typedef int CGSConnectionID;
+typedef int CGSWindowID;
+typedef int CGSSurfaceID;
+
+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
 
 #include <GL/glx.h>
 #include "glext/glxext.h"
@@ -91,12 +118,7 @@ typedef struct _WGLSWAP
 /* Prevent collision with Trace::Bool */
 #undef Bool
 
-#endif /* !_WIN32 */
-
-#ifdef __APPLE__
-
-#include <OpenGL/CGLCurrent.h>
+#endif
 
-#endif /* __APPLE__ */
 
 #endif /* _GLIMPORTS_HPP_ */