ecere/gfx/drivers/OpenGL: Fixes for Android

diff --git a/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec b/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
index 7f77eba..fe636a4 100644 (file)
--- a/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
+++ b/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
@@ -665,7 +665,7 @@ class OpenGLDisplayDriver : DisplayDriver
    {
       GLCapabilities capabilities;
 #if !defined(_GLES2)
-      const char * extensions = (canCheckExtensions && oglDisplay.compat) ? (const char *)glGetString(GL_EXTENSIONS) : null;
+      const char * extensions = (canCheckExtensions && (!oglDisplay || oglDisplay.compat)) ? (const char *)glGetString(GL_EXTENSIONS) : null;
 #endif
 #ifdef DIAGNOSTICS
       printf("extensions: %s\n", extensions);
@@ -2849,6 +2849,8 @@ class OpenGLDisplayDriver : DisplayDriver
 
             if(!light.multiplier) light.multiplier = 1.0f;
 
+            GLFlushMatrices();
+
             color[0] = light.diffuse.r * light.multiplier;
             color[1] = light.diffuse.g * light.multiplier;
             color[2] = light.diffuse.b * light.multiplier;