Define MAY_HAVE_GLES3 on all platforms. Tell me if there are any errors on Maemo/Meego or other ARM platforms.

This commit is contained in:
Sacha committed 2014-06-02 11:32:38 +10:00
1 parent d3fb0459e6
commit b0968fb7bb
2 files changed
+4 -7

No files matched your search

+3 -4
View File
@@ -3,6 +3,9 @@
#ifdef IOS
#include <OpenGLES/ES3/gl.h>
#include <OpenGLES/ES3/glext.h>
#elif defined(BLACKBERRY)
#include <GLES3/gl3.h>
#include <GLES3/gl3ext.h>
#elif defined(USING_GLES2)
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
@@ -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
+1 -3
View File
@@ -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