mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-10 03:19:40 +00:00
[149/906] same as previous commit
This commit is contained in:
parent
9f4d1de046
commit
a8552d4795
1 changed files with 5 additions and 7 deletions
|
@ -1430,6 +1430,10 @@ gst_gl_display_thread_use_fbo (GstGLDisplay *display)
|
||||||
glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
|
glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
|
||||||
GL_TEXTURE_RECTANGLE_ARB, display->use_fbo_texture, 0);
|
GL_TEXTURE_RECTANGLE_ARB, display->use_fbo_texture, 0);
|
||||||
|
|
||||||
|
if (GLEW_ARB_fragment_shader)
|
||||||
|
gst_gl_shader_use (NULL);
|
||||||
|
|
||||||
|
|
||||||
glPushAttrib(GL_VIEWPORT_BIT);
|
glPushAttrib(GL_VIEWPORT_BIT);
|
||||||
|
|
||||||
glMatrixMode(GL_PROJECTION);
|
glMatrixMode(GL_PROJECTION);
|
||||||
|
@ -1466,12 +1470,6 @@ gst_gl_display_thread_use_fbo (GstGLDisplay *display)
|
||||||
|
|
||||||
glDrawBuffer(GL_NONE);
|
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();
|
glPopMatrix();
|
||||||
glMatrixMode(GL_MODELVIEW);
|
glMatrixMode(GL_MODELVIEW);
|
||||||
|
|
Loading…
Reference in a new issue