Changeset 1083Tweet

Timestamp:

Nov 21, 2011, 1:49:50 AM (12 years ago)

Author:

sam

Message:

gl: do not enable or disable GL_TEXTURE_2D with GLES 2.0, it's now illegal.

Location:

trunk/src

Files:

• debug/quad.cpp (modified) (5 diffs)
• scene.cpp (modified) (4 diffs)

trunk/src/debug/quad.cpp

@@ -163 +163 @@
 
         /* Checkerboard texture */
+#if !defined HAVE_GLES_2X
         glEnable(GL_TEXTURE_2D);
+#endif
         glBindTexture(GL_TEXTURE_2D, data->texture[0]);
         for (int j = 0; j < TEX_SIZE; j++)
@@ -304 +306 @@
      */
 #if defined HAVE_GLBEGIN || defined USE_GLEW
+#if !defined HAVE_GLES_2X
     glEnable(GL_TEXTURE_2D);
+#endif
     glBindTexture(GL_TEXTURE_2D, data->texture[0]);
     glColor3f(1.0f, 1.0f, 1.0f);
@@ -328 +332 @@
         glVertex3f(data->aa.x, data->bb.y, 0.0f);
     glEnd();
+#if !defined HAVE_GLES_2X
     glDisable(GL_TEXTURE_2D);
+#endif
 #endif
 
@@ -1078 +1084 @@
 #endif
 
+#if !defined HAVE_GLES_2X
     glEnable(GL_TEXTURE_2D);
+#endif
     glBindTexture(GL_TEXTURE_2D, 0);
 #if defined HAVE_GLBEGIN || defined USE_GLEW || defined __CELLOS_LV2__
@@ -1086 +1094 @@
     glTexEnvi(GL_POINT_SPRITE, GL_COORD_REPLACE, GL_FALSE);
 #endif
+#if !defined HAVE_GLES_2X
     glDisable(GL_TEXTURE_2D);
+#endif
 
     glDisable(GL_BLEND);

trunk/src/scene.cpp

@@ -138 +138 @@
 #if !defined __CELLOS_LV2__
         stdshader = Shader::Create(
+#if !defined HAVE_GLES_2X
             "#version 130\n"
+#endif
             "\n"
 #if defined HAVE_GLES_2X
@@ -163 +165 @@
             "}\n",
 
+#if !defined HAVE_GLES_2X
             "#version 130\n"
+#else
+            "precision mediump float;\n"
+#endif
             "\n"
             "uniform sampler2D in_Texture;\n"
@@ -318 +324 @@
 #endif
 
+#if !defined HAVE_GLES_2X
     glEnable(GL_TEXTURE_2D);
+#endif
     glEnable(GL_DEPTH_TEST);
     glDepthFunc(GL_LEQUAL);
@@ -406 +414 @@
     data->ntiles = 0;
 
+#if !defined HAVE_GLES_2X
     glDisable(GL_TEXTURE_2D);
+#endif
     glDisable(GL_DEPTH_TEST);
 #if defined HAVE_GL_2X && !defined __APPLE__