diff --git a/gfx/gl_common.h b/gfx/gl_common.h index d2a1a09255..b8437bd399 100644 --- a/gfx/gl_common.h +++ b/gfx/gl_common.h @@ -6,9 +6,6 @@ #elif defined(USING_GLES2) #include #include -#if !defined(MAEMO) && !defined(MEEGO_EDITION_HARMATTAN) -#include // X11 pollutes namespace -#endif // At least Nokia platforms need the three below #include typedef char GLchar; diff --git a/gfx_es2/gl_state.h b/gfx_es2/gl_state.h index ccee34582e..157afc58c8 100644 --- a/gfx_es2/gl_state.h +++ b/gfx_es2/gl_state.h @@ -17,6 +17,7 @@ #endif #if defined(ANDROID) || defined(BLACKBERRY) +#include // Additional extensions not included in GLES2/gl2ext.h from the NDK typedef uint64_t EGLuint64NV; @@ -28,9 +29,6 @@ extern PFNEGLGETSYSTEMTIMENVPROC eglGetSystemTimeNV; typedef GLvoid* (GL_APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access); extern PFNGLMAPBUFFERPROC glMapBuffer; -#endif - -#if !defined(IOS) && !defined(MEEGO_EDITION_HARMATTAN) typedef void (EGLAPIENTRYP PFNGLDRAWTEXTURENVPROC) (GLuint texture, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1); extern PFNGLDRAWTEXTURENVPROC glDrawTextureNV; typedef void (EGLAPIENTRYP PFNGLCOPYIMAGESUBDATANVPROC) (GLuint srcName, GLenum @@ -43,9 +41,7 @@ typedef void (EGLAPIENTRYP PFNGLBLITFRAMEBUFFERNVPROC) ( GLint dstX0, GLint dstY0, GLint dstX1, GLuint dstY1, GLint mask, GLenum filter); extern PFNGLBLITFRAMEBUFFERNVPROC glBlitFramebufferNV; -#endif -#if defined(ANDROID) || defined(BLACKBERRY) extern PFNGLDISCARDFRAMEBUFFEREXTPROC glDiscardFramebufferEXT; extern PFNGLGENVERTEXARRAYSOESPROC glGenVertexArraysOES; extern PFNGLBINDVERTEXARRAYOESPROC glBindVertexArrayOES;