X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=dispatch%2Feglimports.hpp;h=49cf177ac91887e6cc2b9f93126ae19fcc3ab93f;hb=2a5696befce6be00fa655b751af5ce2924ea45ae;hp=a3e396abf8046d63ffb373b215c8cc03f7030bc6;hpb=003fbab2d87c2d8c2aa6bf15c8f9c21a40fee2eb;p=apitrace diff --git a/dispatch/eglimports.hpp b/dispatch/eglimports.hpp index a3e396a..49cf177 100644 --- a/dispatch/eglimports.hpp +++ b/dispatch/eglimports.hpp @@ -52,6 +52,13 @@ #include +// OpenGL ES 2.0 + +// avoid conflicting with GL_NV_multisample_coverage +#define GL_NV_coverage_sample +#include "GLES2/gl2ext.h" + + // OpenGL ES 1.1 typedef int32_t GLfixed; typedef int32_t GLclampx; @@ -77,18 +84,8 @@ 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_ +#undef _glext_h_ #include "GLES/glext.h" -// OpenGL ES 2.0 - -// avoid conflicting with GL_NV_multisample_coverage -#define GL_NV_coverage_sample -#include "GLES2/gl2ext.h" - - #endif /* _EGLIMPORTS_HPP_ */