From 7e5123cd90ce7a5009fcdea8103f4b0097fb3531 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Thu, 14 May 2015 16:42:09 +1000 Subject: [PATCH] gl: remove useless gl{En,Dis}able (GL_TEXTURE_*) calls We are using shaders everywhere and so they are not needed --- ext/gl/gstglmosaic.c | 1 - ext/gl/gstglvideomixer.c | 3 --- 2 files changed, 4 deletions(-) diff --git a/ext/gl/gstglmosaic.c b/ext/gl/gstglmosaic.c index 726674b4df..0a9834138b 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 f39313772d..d27396f4cf 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);