Changeset 683Tweet

Timestamp:

Feb 22, 2011, 2:17:48 AM (10 years ago)

Author:

sam

Message:

Try to fix GLES 2 rendering. No luck so far.

Location:

trunk/src

Files:

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

trunk/src/eglapp.cpp

@@ -25 +25 @@
 
 #include "core.h"
+#include "lolgl.h"
 #include "eglapp.h"
 

trunk/src/scene.cpp

@@ -155 +155 @@
 
 #if defined HAVE_GL_2X || defined HAVE_GLES_2X
-    GLuint uni, attr_pos, attr_tex;
-    uni = stdshader->GetUniformLocation("model_matrix");
+    GLuint uni_mat, uni_tex, attr_pos, attr_tex;
     attr_pos = stdshader->GetAttribLocation("in_Position");
     attr_tex = stdshader->GetAttribLocation("in_TexCoord");
 
     stdshader->Bind();
-    glUniformMatrix4fv(uni, 1, GL_FALSE, &model_matrix[0][0]);
+    uni_mat = stdshader->GetUniformLocation("model_matrix");
+    glUniformMatrix4fv(uni_mat, 1, GL_FALSE, &model_matrix[0][0]);
+    uni_tex = stdshader->GetUniformLocation("in_Texture");
+    glUniform1i(uni_tex, 0);
 
     glEnable(GL_DEPTH_TEST);
@@ -210 +212 @@
 
 #if defined HAVE_GL_2X || defined HAVE_GLES_2X
+        stdshader->Bind();
+#endif
+        glActiveTexture(GL_TEXTURE0);
+        Tiler::Bind(data->tiles[i].code);
+
+#if defined HAVE_GL_2X || defined HAVE_GLES_2X
 #   if !defined HAVE_GLES_2X
         glBindVertexArray(data->vao);
@@ -248 +256 @@
 #endif
 
-#if defined HAVE_GL_2X || defined HAVE_GLES_2X
-        stdshader->Bind();
-#endif
-
-        Tiler::Bind(data->tiles[i].code);
         glDrawArrays(GL_TRIANGLES, 0, (n - i) * 6);
 

trunk/src/video.cpp

@@ -31 +31 @@
 #if defined HAVE_GL_2X || defined HAVE_GLES_2X
 static char const *vertexshader =
+#if !defined HAVE_GLES_2X
+    "#version 130\n"
+#endif
+    "\n"
 #if defined HAVE_GLES_2X
     "attribute vec3 in_Position;\n"
@@ -36 +40 @@
     "varying vec2 pass_TexCoord;\n"
 #else
-    "#version 130\n"
-    "\n"
     "in vec3 in_Position;\n"
     "in vec2 in_TexCoord;\n"
@@ -60 +62 @@
 
 static char const *fragmentshader =
+#if !defined HAVE_GLES_2X
     "#version 130\n"
+#endif
     "\n"
     "uniform sampler2D in_Texture;\n"
@@ -71 +75 @@
     "void main()\n"
     "{\n"
-    //"    gl_FragColor = 0.5 * (texture2D(in_Texture, vec2(gl_TexCoord[0]))\n"
-    //"                           + vec4(pass_Color, 1.0));\n"
-#if defined HAVE_GLES_2X
-    "    gl_FragColor = vec4(0.5, 1.0, 0.0, 0.5);\n"
+#if defined HAVE_GLES_2X
+    "    gl_FragColor = texture2D(in_Texture, pass_TexCoord);\n"
+    //"    gl_FragColor = vec4(0.5, 1.0, 0.0, 0.5);\n"
+    //"    gl_FragColor = vec4(pass_TexCoord * 4.0, 0.0, 0.25);\n"
 #else
     "    gl_FragColor = texture2D(in_Texture, vec2(gl_TexCoord[0]));\n"
 #endif
-    //"    gl_FragColor = texture2D(in_Texture, pass_TexCoord);\n"
     "}\n";
 #endif