ecere/gfx/drivers/OpenGL (Android): Fixed blank textures nextshaders
authorJerome St-Louis <jerome@ecere.com>
Tue, 28 Jun 2016 00:42:42 +0000 (20:42 -0400)
committerJerome St-Louis <jerome@ecere.com>
Sun, 3 Jul 2016 08:36:50 +0000 (04:36 -0400)
- CheckExtension() was not being called and not setting up pow2textures and max texture size

ecere/src/gfx/3D/models/Object3DSFormat.ec
ecere/src/gfx/drivers/OpenGLDisplayDriver.ec

index 80ccae2..18afb6c 100644 (file)
@@ -8,7 +8,7 @@ import "Object"
 #endif
 #endif
 
-#if defined(__ANDROID__) || defined(__ODROID__)
+#if (defined(__ANDROID__) || defined(__ODROID__)) && !defined(_GLES)
 #define _GLES
 #endif
 
index 9269915..cd5524b 100644 (file)
@@ -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);