Bundle all headers for Khronos APIs.

[apitrace] / eglimports.hpp

diff --git a/eglimports.hpp b/eglimports.hpp
index 2fd1e0a07f084d2e69424f3ce8c85f6681c17401..5443bef61d3bddb633a1362761951be7c992855e 100644 (file)
--- a/eglimports.hpp
+++ b/eglimports.hpp
@@ -32,30 +32,11 @@
 #define _EGLIMPORTS_HPP_
 
 
-// OpenGL
-#ifndef __gl_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
-#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
 
@@ -84,7 +65,7 @@
 #define GL_APIENTRY APIENTRY
 #endif
 
-#endif // HAVE_EGL
+#endif //! HAVE_EGL
 
 
 // OpenGL ES 1.1
@@ -110,9 +91,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"