#define _GLIMPORTS_HPP_
-// Prevent including system's glext.h
+// Prevent including MacOSX's glext.h which lives in OpenGL/glext.h and not
+// GL/glext.h
#define __glext_h_
+
// Some functions take GLenum disguised as GLint. Apple noticed and fixed it
// in the Mac OS X 10.6.x gl.h headers. Regardless, C++ typechecking rules
// force the wrappers to match the prototype precisely.
-#if defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_7)
-#define GLenum_int GLenum
+#if defined(__APPLE__)
+# include <AvailabilityMacros.h> // for MAC_OS_X_VERSION_10_7
+# if defined(MAC_OS_X_VERSION_10_7)
+# define GLenum_int GLint
+# else
+# define GLenum_int GLenum
+# endif
#else
-#define GLenum_int GLint
+# define GLenum_int GLint
#endif
#else
+#ifdef HAVE_X11
#include <X11/Xlib.h>
+#endif
+
#include <GL/gl.h>
#endif /* !_WIN32 */
// Include our own glext.h
#undef __glext_h_
-#include "glext/glext.h"
+#include <GL/glext.h>
#ifndef 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
+#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
+
#if defined(_WIN32)
-#include "glext/wglext.h"
+#include <GL/wglext.h>
#define GLAPIENTRY __stdcall
#else
+#ifdef HAVE_X11
#include <GL/glx.h>
-#include "glext/glxext.h"
+#include <GL/glxext.h>
+#endif
/* Prevent collision with trace::Bool */
#undef Bool
#endif
+#include "eglimports.hpp"
+
+
#endif /* _GLIMPORTS_HPP_ */