Remove codegen.py.

[apitrace] / glimports.hpp

diff --git a/glimports.hpp b/glimports.hpp
index a24e20f139db217824e891542a88202a01240e0a..773d50f4914a23c3e6a07a7e743dc01f5cd04888 100644 (file)
--- a/glimports.hpp
+++ b/glimports.hpp
@@ -31,46 +31,32 @@
 #define _GLIMPORTS_HPP_
 
 
-// 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>
-
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN 1
+#  endif
+#  include <windows.h>
 #elif defined(__APPLE__)
-
-#include <OpenGL/gl.h>
-
-#else
-
-#include <X11/Xlib.h>
-#include <GL/gl.h>
-
+#elif defined(HAVE_X11)
+#  include <X11/Xlib.h>
 #endif /* !_WIN32 */
 
 
-// Include our own glext.h
-#undef __glext_h_
-#include "glext/glext.h"
+#include <GL/gl.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"
-
-#define GLAPIENTRY __stdcall
+#include <GL/wglext.h>
 
 #ifndef PFD_SUPPORT_DIRECTDRAW
 #define PFD_SUPPORT_DIRECTDRAW 0x00002000
@@ -98,6 +84,12 @@ typedef struct _WGLSWAP
 #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
@@ -113,13 +105,18 @@ CGLError CGLUpdateContext(CGLContextObj ctx);
 
 #else
 
+#ifdef HAVE_X11
 #include <GL/glx.h>
-#include "glext/glxext.h"
+#include <GL/glxext.h>
+#endif
 
-/* Prevent collision with Trace::Bool */
+/* Prevent collision with trace::Bool */
 #undef Bool
 
 #endif
 
 
+#include "eglimports.hpp"
+
+
 #endif /* _GLIMPORTS_HPP_ */