Bundle all headers for Khronos APIs.

[apitrace] / eglimports.hpp

diff --git a/eglimports.hpp b/eglimports.hpp
index ece78cfc9655d9ca649b8812cbf4fe8f6b17f538..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
 
@@ -112,6 +93,9 @@ typedef int32_t  GLclampx;
 #define GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES                  0x8B9F
 #endif
 
+// avoid conflict with GL_EXT_framebuffer_multisample
+#define GL_EXT_multisampled_render_to_texture
+
 #undef __glext_h_
 #include "GLES/glext.h"