Changeset 675Tweet

Timestamp:

Feb 21, 2011, 12:01:21 PM (9 years ago)

Author:

sam

Message:

Fix the GLESv2 rendering.

Location:

trunk/src

Files:

• scene.cpp (modified) (4 diffs)
• video.cpp (modified) (1 diff)

trunk/src/scene.cpp

@@ -209 +209 @@
         }
 
-#if defined HAVE_GL_2X
+#if defined HAVE_GL_2X || defined HAVE_GLES_2X
+#   if !defined HAVE_GLES_2X
         glBindVertexArray(data->vao);
+#   endif
         glEnableVertexAttribArray(attr_pos);
         glEnableVertexAttribArray(attr_tex);
-#elif defined HAVE_GLES_2X
-        glEnableVertexAttribArray(attr_pos);
-        glEnableVertexAttribArray(attr_tex);
 #else
         glEnableClientState(GL_VERTEX_ARRAY);
@@ -221 +220 @@
 #endif
 
-#if defined HAVE_GL_2X
+#if defined HAVE_GL_2X || defined HAVE_GLES_2X
         glBindBuffer(GL_ARRAY_BUFFER, data->bufs[buf]);
         glBufferData(GL_ARRAY_BUFFER, 18 * (n - i) * sizeof(GLfloat),
                      vertex, GL_STATIC_DRAW);
         glVertexAttribPointer(attr_pos, 3, GL_FLOAT, GL_FALSE, 0, 0);
-#elif defined HAVE_GLES_2X
-        glBindBuffer(GL_ARRAY_BUFFER, data->bufs[buf]);
-        glVertexAttribPointer(attr_pos, 3, GL_FLOAT, GL_FALSE, 0, vertex);
 #elif defined HAVE_GL_1X
         glBindBuffer(GL_ARRAY_BUFFER, data->bufs[buf]);
@@ -238 +234 @@
 #endif
 
-#if defined HAVE_GL_2X
+#if defined HAVE_GL_2X || defined HAVE_GLES_2X
         glBindBuffer(GL_ARRAY_BUFFER, data->bufs[buf + 1]);
         glBufferData(GL_ARRAY_BUFFER, 12 * (n - i) * sizeof(GLfloat),
                      texture, GL_STATIC_DRAW);
         glVertexAttribPointer(attr_tex, 2, GL_FLOAT, GL_FALSE, 0, 0);
-#elif defined HAVE_GLES_2X
-        glBindBuffer(GL_ARRAY_BUFFER, data->bufs[buf + 1]);
-        glVertexAttribPointer(attr_tex, 2, GL_FLOAT, GL_FALSE, 0, texture);
 #elif defined HAVE_GL_1X
         glBindBuffer(GL_ARRAY_BUFFER, data->bufs[buf + 1]);
@@ -262 +255 @@
         glDrawArrays(GL_TRIANGLES, 0, (n - i) * 6);
 
-#if defined HAVE_GL_2X
+#if defined HAVE_GL_2X || defined HAVE_GLES_2X
+#   if !defined HAVE_GLES_2X
         glBindVertexArray(0);
-        glDisableVertexAttribArray(attr_pos);
-        glDisableVertexAttribArray(attr_tex);
-#elif defined HAVE_GLES_2X
+#   endif
         glDisableVertexAttribArray(attr_pos);
         glDisableVertexAttribArray(attr_tex);

trunk/src/video.cpp

@@ -54 +54 @@
     "uniform sampler2D in_Texture;\n"
     //"in vec3 pass_Color;\n"
-    "out vec4 out_Color;\n"
+    //"out vec4 out_Color;\n"
     "\n"
     "void main()\n"