[vlc-commits] Use glEnable/glDisable with GL_TEXTURE_2D only for fixed pipeline(GLES 1.x)

[Gleb Pinigin]

vlc | branch: master | Gleb Pinigin <gpinigin at gmail.com> | Mon May 27 15:15:49 2013 +0700| [26580f9e79ce9a1df8b82cf6c86faf6fbc22dc99] | committer: Felix Paul Kühne

Use glEnable/glDisable with GL_TEXTURE_2D only for fixed pipeline(GLES 1.x)

Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

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

 modules/video_output/opengl.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index c9d9df2..735c591 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -948,7 +948,6 @@ static void DrawWithShaders(vout_display_opengl_t *vgl,
         };
         glActiveTexture(GL_TEXTURE0+j);
         glClientActiveTexture(GL_TEXTURE0+j);
-        glEnable(vgl->tex_target);
         glBindTexture(vgl->tex_target, vgl->texture[0][j]);
 
         char attribute[20];
@@ -1022,7 +1021,9 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl,
 #endif
     }
 
+#ifdef SUPPORTS_FIXED_PIPELINE
     glEnable(GL_TEXTURE_2D);
+#endif
     glEnable(GL_BLEND);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
@@ -1072,7 +1073,9 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl,
         }
     }
     glDisable(GL_BLEND);
+#ifdef SUPPORTS_FIXED_PIPELINE
     glDisable(GL_TEXTURE_2D);
+#endif
 
     /* Display */
     vlc_gl_Swap(vgl->gl);