]> git.sesse.net Git - vlc/commitdiff
opengl: use glEnable when not using shaders
authorIlkka Ollakka <ileoo@videolan.org>
Sun, 1 Jul 2012 13:55:07 +0000 (16:55 +0300)
committerIlkka Ollakka <ileoo@videolan.org>
Sun, 1 Jul 2012 17:55:33 +0000 (20:55 +0300)
modules/video_output/opengl.c

index 567819269745281b0ec3d819bba231d0302d100a..ec160505cf9e26b2d1a9ec41f3c36667f54be197 100644 (file)
@@ -794,8 +794,12 @@ static void draw_without_shaders( vout_display_opengl_t *vgl, float *left, float
 
     glEnableClientState(GL_VERTEX_ARRAY);
     glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+    glEnable(GL_VERTEX_ARRAY);
+    glEnable(GL_TEXTURE_COORD_ARRAY);
+
     vgl->ActiveTexture( GL_TEXTURE0);
     vgl->ClientActiveTexture( GL_TEXTURE0);
+
     glEnable(vgl->tex_target);
     glBindTexture(vgl->tex_target, vgl->texture[0][0]);
     glVertexPointer(2, GL_FLOAT, 0, vertexCoord);
@@ -803,9 +807,11 @@ static void draw_without_shaders( vout_display_opengl_t *vgl, float *left, float
 
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 
+    glDisable(vgl->tex_target);
+    glDisable(GL_TEXTURE_COORD_ARRAY);
+    glDisable(GL_VERTEX_ARRAY);
     glDisableClientState(GL_TEXTURE_COORD_ARRAY);
     glDisableClientState(GL_VERTEX_ARRAY);
-    glDisable(vgl->tex_target);
 }
 
 static void draw_with_shaders( vout_display_opengl_t *vgl, float *left, float *top, float *right, float *bottom )