Changeset 1480Tweet

Timestamp:

Jun 15, 2012, 2:40:48 PM (9 years ago)

Author:

sam

Message:

gpu: better state restoration after vertex buffer usage.

File:

• trunk/src/gpu/vertexbuffer.cpp (modified) (5 diffs)

trunk/src/gpu/vertexbuffer.cpp

@@ -148 +148 @@
     glEnable(GL_CULL_FACE);
 #   if defined HAVE_GL_2X && !defined __APPLE__
+    /* FIXME: this has nothing to do here! */
     glEnable(GL_ALPHA_TEST);
     glAlphaFunc(GL_GEQUAL, 0.01f);
@@ -163 +164 @@
         break;
     }
+#   if defined HAVE_GL_2X && !defined __APPLE__
+    /* FIXME: this has nothing to do here! */
+    glDisable(GL_ALPHA_TEST);
+#   endif
 #endif
 }
@@ -191 +196 @@
 #else
 #   if defined HAVE_GL_2X && !defined __APPLE__
+    /* FIXME: this has nothing to do here! */
     glEnable(GL_ALPHA_TEST);
     glAlphaFunc(GL_GEQUAL, 0.01f);
@@ -208 +214 @@
         break;
     }
+#   if defined HAVE_GL_2X && !defined __APPLE__
+    /* FIXME: this has nothing to do here! */
+    glDisable(GL_ALPHA_TEST);
+#   endif
 #endif
 }
@@ -230 +240 @@
     for (int i = 0; i < 12; i++)
         glDisableVertexAttribArray(i);
+    glBindBuffer(GL_ARRAY_BUFFER, 0);
     /* FIXME: only useful for VAOs */
     //glBindBuffer(GL_ARRAY_BUFFER, 0);