From 83e154959f107678b5ae3af9c28aceaa85b4aecc Mon Sep 17 00:00:00 2001
From: Jerome St-Louis <jerome@ecere.com>
Date: Fri, 26 Jun 2015 19:33:54 -0400
Subject: [PATCH] ecere/gfx/drivers/OpenGL; 3DS: Fixed GLES indices, matrix
 stack issues

---
 ecere/src/gfx/3D/models/Object3DSFormat.ec   |  2 +-
 ecere/src/gfx/drivers/OpenGLDisplayDriver.ec | 45 +++++++++++++++-------------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/ecere/src/gfx/3D/models/Object3DSFormat.ec b/ecere/src/gfx/3D/models/Object3DSFormat.ec
index 0dbdeda..0733bcc 100644
--- a/ecere/src/gfx/3D/models/Object3DSFormat.ec
+++ b/ecere/src/gfx/3D/models/Object3DSFormat.ec
@@ -2,7 +2,7 @@ namespace gfx3D::models;
 
 import "Object"
 
-#if !defined(__ANDROID__)
+#if !defined(_GLES)
 #define USE_32_BIT_INDICES true
 #define indicesMember indices32
 #define uintindex uint32
diff --git a/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec b/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
index d715fc9..6a364cb 100644
--- a/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
+++ b/ecere/src/gfx/drivers/OpenGLDisplayDriver.ec
@@ -1428,6 +1428,9 @@ public struct GLEAB
    {
       if(curElementBuffer != ((this != null) ? buffer : 0))
          GLBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ((this != null) ? buffer : 0));
+#ifdef _GLES
+      type = GL_UNSIGNED_SHORT;
+#endif
       glDrawElements(primType, count, type, indices);
    }
 };
@@ -2090,6 +2093,7 @@ class OpenGLDisplayDriver : DisplayDriver
          glEnable(GL_BLEND);
 
          glMatrixMode(GL_MODELVIEW);
+         glLoadIdentity(); // For setting up GLES stack
          glScaled(1.0, 1.0, -1.0);
          // glTranslatef(0.375f, 0.375f, 0.0f);
          // glTranslatef(-0.625f, -0.625f, 0.0f);
@@ -2484,6 +2488,7 @@ class OpenGLDisplayDriver : DisplayDriver
       result = false;
 
       glViewport(0,0,width,height);
+      glMatrixMode(GL_PROJECTION);
       glLoadIdentity();
       glOrtho(0,width,height,0,0.0,1.0);
       displayWidth = display.width = width;
@@ -3809,13 +3814,10 @@ class OpenGLDisplayDriver : DisplayDriver
          glViewport(x, y, w, h);
 
          // *** Projection Matrix ***
+         glMatrixMode(GL_PROJECTION);
          if(!display.display3D.camera)
-         {
-            glMatrixMode(GL_PROJECTION);
             glPushMatrix();
-         }
-         else
-            glMatrixMode(GL_PROJECTION);
+
          if(display.display3D.collectingHits)
          {
             float pickX = display.display3D.pickX + surface.offset.x;
@@ -4152,6 +4154,17 @@ class OpenGLDisplayDriver : DisplayDriver
    {
       if(vboAvailable)
       {
+#ifdef _GLES
+         if(indices32bit)
+         {
+            if(!oglIndices.buffer.buffer)
+               GLGenBuffers(1, (GLAB *)&oglIndices.buffer);
+            if(curElementBuffer != oglIndices.buffer.buffer)
+               GLBindBuffer(GL_ELEMENT_ARRAY_BUFFER, oglIndices.buffer.buffer);
+            glesBufferDatai(GL_ELEMENT_ARRAY_BUFFER, sizeof(uint32) * nIndices, oglIndices.indices, GL_STATIC_DRAW_ARB);
+         }
+         else
+#endif
          oglIndices.buffer.upload(
             nIndices * (indices32bit ? sizeof(uint32) : sizeof(uint16)),
             oglIndices.indices); //GL_STATIC_DRAW_ARB);
@@ -4285,25 +4298,15 @@ class OpenGLDisplayDriver : DisplayDriver
          }
          else*/
 #endif
+
          {
             OGLIndices oglIndices = primitive->data;
+            GLEAB eab = ((!display.display3D.collectingHits && oglIndices) ? oglIndices.buffer : noEAB);
 
-            if(!display.display3D.collectingHits && vboAvailable && oglIndices)
-            {
-               if(primitive->type.indices32bit)
-                  ; //oglIndices.buffer.draw(primitiveTypes[primitive->type.primitiveType], primitive->nIndices, GL_UNSIGNED_SHORT, 0);
-               else
-                  oglIndices.buffer.draw(primitiveTypes[primitive->type.primitiveType], primitive->nIndices, GL_UNSIGNED_SHORT, 0);
-            }
-            else
-            {
-               if(primitive->type.indices32bit)
-                  glDrawElementsi(primitiveTypes[primitive->type.primitiveType], primitive->nIndices,
-                     oglIndices ? oglIndices.indices : primitive->indices);
-               else
-                  glDrawElements(primitiveTypes[primitive->type.primitiveType], primitive->nIndices,
-                     GL_UNSIGNED_SHORT, oglIndices ? oglIndices.indices : primitive->indices);
-            }
+            eab.draw(primitiveTypes[primitive->type.primitiveType], primitive->nIndices,
+               primitive->type.indices32bit ? GL_UNSIGNED_INT : GL_UNSIGNED_SHORT,
+               eab.buffer ? 0 : (oglIndices ? oglIndices.indices : primitive->indices));
+            GLBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
          }
       }
    }
-- 
1.8.3.1