mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 23:48:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

qt/gloverlay: reset OpenGL state after Qt drawing

Browse source 
Reset to the original OpenGL state as required by the GStreamer OpenGL
API contract.  Fixes output with a glimagesink element downstream.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/623>
This commit is contained in:
Matthew Waters 2020-06-12 12:18:11 +10:00 committed by GStreamer Merge Bot
parent ffe4d09efc
commit 6fba2e3dd3
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ext/qt/qtglrenderer.cc
View file

@ -555,6 +555,8 @@ void GstQuickRenderer::ensureFbo()
void void
GstQuickRenderer::renderGstGL () GstQuickRenderer::renderGstGL ()
{ {
const GstGLFuncs *gl = gl_context->gl_vtable;
GST_TRACE ("%p current QOpenGLContext %p", this, GST_TRACE ("%p current QOpenGLContext %p", this,
QOpenGLContext::currentContext()); QOpenGLContext::currentContext());
m_quickWindow->resetOpenGLState(); m_quickWindow->resetOpenGLState();
@ -585,6 +587,11 @@ GstQuickRenderer::renderGstGL ()
gl_mem = (GstGLMemory *) gst_gl_base_memory_alloc (gl_allocator, gl_params); gl_mem = (GstGLMemory *) gst_gl_base_memory_alloc (gl_allocator, gl_params);
m_fbo = nullptr; m_fbo = nullptr;
m_quickWindow->resetOpenGLState ();
/* Qt doesn't seem to reset this, breaking glimagesink */
if (gl->DrawBuffer)
gl->DrawBuffer (GL_BACK);
} }
GstGLMemory *GstQuickRenderer::generateOutput(GstClockTime input_ns) GstGLMemory *GstQuickRenderer::generateOutput(GstClockTime input_ns)