From: Matthew Waters <matthew@centricular.com>
Date: Thu, 14 May 2015 06:42:09 +0000 (+1000)
Subject: gl: remove useless gl{En,Dis}able (GL_TEXTURE_*) calls
X-Git-Tag: 1.16.2~260^2~206
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e5123cd90ce7a5009fcdea8103f4b0097fb3531;p=platform%2Fupstream%2Fgst-plugins-base.git

gl: remove useless gl{En,Dis}able (GL_TEXTURE_*) calls

We are using shaders everywhere and so they are not needed
---

diff --git a/ext/gl/gstglmosaic.c b/ext/gl/gstglmosaic.c
index 726674b..0a98341 100644
--- a/ext/gl/gstglmosaic.c
+++ b/ext/gl/gstglmosaic.c
@@ -242,7 +242,6 @@ gst_gl_mosaic_callback (gpointer stuff)
 
   gst_gl_context_clear_shader (GST_GL_BASE_MIXER (mixer)->context);
   gl->BindTexture (GL_TEXTURE_2D, 0);
-  gl->Disable (GL_TEXTURE_2D);
 
   gl->Enable (GL_DEPTH_TEST);
 
diff --git a/ext/gl/gstglvideomixer.c b/ext/gl/gstglvideomixer.c
index f393137..d27396f 100644
--- a/ext/gl/gstglvideomixer.c
+++ b/ext/gl/gstglvideomixer.c
@@ -911,9 +911,6 @@ gst_gl_video_mixer_callback (gpointer stuff)
 
   gst_gl_context_clear_shader (GST_GL_BASE_MIXER (mixer)->context);
   gl->BindTexture (GL_TEXTURE_2D, 0);
-  if (gst_gl_context_get_gl_api (GST_GL_BASE_MIXER (mixer)->context) &
-      GST_GL_API_OPENGL)
-    gl->Disable (GL_TEXTURE_2D);
 
   gl->Disable (GL_DEPTH_TEST);
   gl->Disable (GL_CULL_FACE);