From a8552d479581e26d0d8d4290fec331ef21c9be2b Mon Sep 17 00:00:00 2001 From: Filippo Argiolas Date: Mon, 11 Aug 2008 17:21:30 +0200 Subject: [PATCH] [149/906] same as previous commit --- gst-libs/gst/gl/gstgldisplay.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c index 846b76f..1c7f293 100644 --- a/gst-libs/gst/gl/gstgldisplay.c +++ b/gst-libs/gst/gl/gstgldisplay.c @@ -1430,6 +1430,10 @@ gst_gl_display_thread_use_fbo (GstGLDisplay *display) glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_RECTANGLE_ARB, display->use_fbo_texture, 0); + if (GLEW_ARB_fragment_shader) + gst_gl_shader_use (NULL); + + glPushAttrib(GL_VIEWPORT_BIT); glMatrixMode(GL_PROJECTION); @@ -1466,13 +1470,7 @@ gst_gl_display_thread_use_fbo (GstGLDisplay *display) glDrawBuffer(GL_NONE); - //in case of the developer forgot the de-init use of GLSL in the scene code - if (display->colorspace_conversion == GST_GL_DISPLAY_CONVERSION_GLSL) - glUseProgramObjectARB (0); - - glDisable(GL_TEXTURE_RECTANGLE_ARB); - - glMatrixMode(GL_PROJECTION); + glMatrixMode(GL_PROJECTION); glPopMatrix(); glMatrixMode(GL_MODELVIEW); glPopMatrix(); -- 2.7.4