[vlc-commits] remove few #if OPENGL_ES

[Ilkka Ollakka]

vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Fri Mar 23 10:21:50 2012 +0200| [46d64803161e5854458e1b5bd6b3f8b42feec0e1] | committer: Ilkka Ollakka

remove few #if OPENGL_ES

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=46d64803161e5854458e1b5bd6b3f8b42feec0e1
---

 modules/video_output/opengl.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 1bbf70b..94e63ed 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -672,6 +672,7 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl,
 
     glDisableClientState(GL_TEXTURE_COORD_ARRAY);
     glDisableClientState(GL_VERTEX_ARRAY);
+    glDisable(vgl->tex_target);
 #else
 
     const GLfloat vertexCoord[] = {
@@ -708,14 +709,12 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl,
     }
 
 
-#endif
 
     if (vgl->program)
         glDisable(GL_FRAGMENT_PROGRAM_ARB);
     else
         glDisable(vgl->tex_target);
 
-#if !USE_OPENGL_ES
     if (vgl->use_multitexture)
         vgl->ActiveTextureARB(GL_TEXTURE0_ARB + 0);
     glEnable(GL_TEXTURE_2D);