From b0968fb7bb93522a8e2f4fe8c01a08f5ef68b9cf Mon Sep 17 00:00:00 2001 From: Sacha Date: Mon, 2 Jun 2014 11:32:02 +1000 Subject: [PATCH] Define MAY_HAVE_GLES3 on all platforms. Tell me if there are any errors on Maemo/Meego or other ARM platforms. --- gfx/gl_common.h | 7 +++---- gfx_es2/gl3stub.c | 4 +--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/gfx/gl_common.h b/gfx/gl_common.h index 0bb02d8158..c44678750d 100644 --- a/gfx/gl_common.h +++ b/gfx/gl_common.h @@ -3,6 +3,9 @@ #ifdef IOS #include #include +#elif defined(BLACKBERRY) +#include +#include #elif defined(USING_GLES2) #include #include @@ -20,9 +23,6 @@ typedef char GLchar; #endif #endif -// Gets 'undefined reference' if enabled -#if !defined(__SYMBIAN32__) && !defined(MAEMO) && !defined(MEEGO_EDITION_HARMATTAN) - #ifdef USING_GLES2 // Support OpenGL ES 3.0 // This uses the "DYNAMIC" approach from the gles3jni NDK sample. @@ -32,4 +32,3 @@ typedef char GLchar; // Now that glew is upgraded beyond 4.3, we can define MAY_HAVE_GLES3 on GL platforms #define MAY_HAVE_GLES3 1 -#endif diff --git a/gfx_es2/gl3stub.c b/gfx_es2/gl3stub.c index 3bdd919b63..8637761d07 100644 --- a/gfx_es2/gl3stub.c +++ b/gfx_es2/gl3stub.c @@ -14,8 +14,6 @@ * limitations under the License. */ -#if !defined(__SYMBIAN32__) && !defined(MEEGO_EDITION_HARMATTAN) && !defined(MAEMO) - #include "../gfx/gl_common.h" #if defined(USING_GLES2) @@ -351,4 +349,4 @@ GL_APICALL void (* GL_APIENTRY glGetInternalformativ) (GLenum target, #endif // IOS #endif // GLES2 -#endif +