Remove codegen.py.

[apitrace] / eglimports.hpp

diff --git a/eglimports.hpp b/eglimports.hpp
index 2fd1e0a07f084d2e69424f3ce8c85f6681c17401..a3e396abf8046d63ffb373b215c8cc03f7030bc6 100644 (file)
--- a/eglimports.hpp
+++ b/eglimports.hpp
@@ -32,30 +32,17 @@
 #define _EGLIMPORTS_HPP_
 
 
-// OpenGL
-#ifndef __gl_h_
+#include <KHR/khrplatform.h>
 
-// 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
+#ifdef _GDI32_
+/* Prevent __declspec(dllimport) attribute */
+#undef KHRONOS_APICALL
+#define KHRONOS_APICALL
 #endif
 
-#endif /* __gl_h_ */
-
-
-#ifdef HAVE_EGL
-
 // EGL
-#include "EGL/egl.h"
-#include "EGL/eglext.h"
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
 /* Prevent collision with Trace::Bool */
 #undef Bool
 
@@ -64,28 +51,6 @@
 #include <GLES/glplatform.h>
 #include <GLES2/gl2platform.h>
 
-#else // HAVE_EGL
-
-// We always include GLES headers below to have the types and enums defined.
-// For that to work without GLES platform headers, we need to define GL_API,
-// GL_APICALL, and GL_APIENTRY.  It does not matter what they are defined to.
-// When we hit here, EGL/GLES support is disabled and all we need from the
-// headers are the types and enums.
-
-#ifndef GL_API
-#define GL_API GLAPI
-#endif
-
-#ifndef GL_APICALL
-#define GL_APICALL GLAPI
-#endif
-
-#ifndef GL_APIENTRY
-#define GL_APIENTRY APIENTRY
-#endif
-
-#endif // HAVE_EGL
-
 
 // OpenGL ES 1.1
 typedef int32_t  GLfixed;
@@ -110,9 +75,11 @@ typedef int32_t  GLclampx;
 #define GL_POINT_SIZE_ARRAY_STRIDE_OES                          0x898B
 #define GL_POINT_SIZE_ARRAY_POINTER_OES                         0x898C
 #define GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES                  0x8B9F
-extern "C" GL_API void GL_APIENTRY glPointSizePointerOES (GLenum type, GLsizei stride, const GLvoid *pointer);
 #endif
 
+// avoid conflict with GL_EXT_framebuffer_multisample
+#define GL_EXT_multisampled_render_to_texture
+
 #undef __glext_h_
 #include "GLES/glext.h"