summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Dufresne <nicolas.dufresne@collabora.com>2015-08-14 17:36:48 +0200
committerNicolas Dufresne <nicolas.dufresne@collabora.com>2015-08-15 15:55:08 +0200
commitea484fb9689bd7e430e75fa6b8a560421a937e5d (patch)
tree65f54846b98f91204f30aab875e5fb17d17ca74f
parent4075b1112cd00d7758b208abeab5afa5ef0bbcbe (diff)
downloadgstreamer-plugins-bad-ea484fb9689bd7e430e75fa6b8a560421a937e5d.tar.gz
glimagesink: Move overlay rendering after video rendering
This is mostly cosmetic, but heoretically it reduces the amount of required object in the context at one point. It also avoids potential conflicts.
-rw-r--r--ext/gl/gstglimagesink.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/gl/gstglimagesink.c b/ext/gl/gstglimagesink.c
index 5f0e3ade7..ae10c4213 100644
--- a/ext/gl/gstglimagesink.c
+++ b/ext/gl/gstglimagesink.c
@@ -1915,8 +1915,6 @@ gst_glimage_sink_on_draw (GstGLImageSink * gl_sink)
gl->DrawElements (GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, 0);
- gst_gl_overlay_compositor_draw_overlays (gl_sink->overlay_compositor);
-
gst_gl_context_clear_shader (gl_sink->context);
if (gl->GenVertexArrays)
@@ -1926,6 +1924,8 @@ gst_glimage_sink_on_draw (GstGLImageSink * gl_sink)
if (gl_sink->ignore_alpha)
gl->Disable (GL_BLEND);
+
+ gst_gl_overlay_compositor_draw_overlays (gl_sink->overlay_compositor);
}
/* end default opengl scene */
window->is_drawing = FALSE;