Warning for glMap*Buffer* failures.

[apitrace] / glimports.hpp

diff --git a/glimports.hpp b/glimports.hpp
index c96a69df7e97d744d1c7b495da376e29a58aa470..5cb276db1d1529bdd311441f92f92b7e3f6bda8b 100644 (file)
--- a/glimports.hpp
+++ b/glimports.hpp
@@ -23,10 +23,15 @@
  *
  **************************************************************************/
 
+/*
+ * Central place for all GL includes, and respective OS dependent headers.
+ */
+
 #ifndef _GLIMPORTS_HPP_
 #define _GLIMPORTS_HPP_
 
-#ifdef WIN32
+
+#if defined(_WIN32)
 
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN 1
@@ -34,23 +39,32 @@
 
 #include <windows.h>
 
-#else /* !WIN32 */
+#elif defined(__APPLE__)
+
+#else
 
 #include <X11/Xlib.h>
 
-#endif /* !WIN32 */
+#endif /* !_WIN32 */
+
+
+// Prevent including system's glext.h
+#define __glext_h_
 
 #include <GL/gl.h>
 
-#include "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
 
-#include "wglext.h"
+#if defined(_WIN32)
+
+#include "glext/wglext.h"
 
 #define GLAPIENTRY __stdcall
 
@@ -61,8 +75,9 @@
 #define PFD_SUPPORT_COMPOSITION 0x00008000
 #endif
 
-#ifdef __MINGW32__
+#ifndef WGL_SWAPMULTIPLE_MAX
 
+extern "C"
 typedef struct _WGLSWAP
 {
     HDC hdc;
@@ -71,13 +86,21 @@ typedef struct _WGLSWAP
 
 #define WGL_SWAPMULTIPLE_MAX 16
 
-#endif /* __MINGW32__ */
+#endif /* !WGL_SWAPMULTIPLE_MAX */
+
+#elif defined(__APPLE__)
+
+#include <OpenGL/OpenGL.h>
 
-#else /* !WIN32 */
+#else
 
 #include <GL/glx.h>
-#include "glxext.h"
+#include "glext/glxext.h"
+
+/* Prevent collision with Trace::Bool */
+#undef Bool
+
+#endif
 
-#endif /* !WIN32 */
 
 #endif /* _GLIMPORTS_HPP_ */