From: Jerome St-Louis <jerome@ecere.com>
Date: Tue, 28 Jun 2016 00:42:42 +0000 (-0400)
Subject: ecere/gfx/drivers/OpenGL (Android): Fixed blank textures
X-Git-Tag: nextshaders
X-Git-Url: http://ecere.com/cgi-bin/gitweb.cgi?p=sdk;a=commitdiff_plain;h=185ea6c4399f11804c7cd97cf226879a29f4b4d1;hp=1067f6b3d2c5404e46b25a4b5d369cff8a475349

ecere/gfx/drivers/OpenGL (Android): Fixed blank textures
- CheckExtension() was not being called and not setting up pow2textures and max texture size
---

diff --git a/ecere/src/gfx/3D/models/Object3DSFormat.ec b/ecere/src/gfx/3D/models/Object3DSFormat.ec
index 80ccae2..18afb6c 100644
--- a/ecere/src/gfx/3D/models/Object3DSFormat.ec
+++ b/ecere/src/gfx/3D/models/Object3DSFormat.ec
@@ -8,7 +8,7 @@ import "Object"
 #endif
 #endif
 
-#if defined(__ANDROID__) || defined(__ODROID__)
+#if (defined(__ANDROID__) || defined(__ODROID__)) && !defined(_GLES)
 #define _GLES
 #endif
 
diff --git a/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec b/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
index 9269915..cd5524b 100644
--- a/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
+++ b/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
@@ -985,8 +985,8 @@ class OpenGLDisplayDriver : DisplayDriver
          egl_init_display(guiApp.desktop.windowHandle);
          #elif defined(__ODROID__)
          egl_init_display((uint)displaySystem.window);
-         CheckExtensions(oglSystem);
          #endif
+         CheckExtensions(oglSystem);
 
          // TODO: Clean this up? Needed here?
          glEnableClientState(GL_VERTEX_ARRAY);