examples/gl/qt: fix the examples for the use of newer API

gstgl doesn't undo/overwrite what GL state the examples are changing
anymore.  As such, the examples need to reset the GL state themselves
to be able to play nice with libgstgl

diff --git a/tests/examples/gl/qt/mousevideooverlay/pipeline.cpp b/tests/examples/gl/qt/mousevideooverlay/pipeline.cpp
index 51cc345677fd1beb53b02490bc695eb808297535..28d8cf81444a312281cd7717dd917c3d4464f67d 100644 (file)
--- a/tests/examples/gl/qt/mousevideooverlay/pipeline.cpp
+++ b/tests/examples/gl/qt/mousevideooverlay/pipeline.cpp
@@ -255,7 +255,11 @@ gboolean Pipeline::drawCallback (void * sink, void *context, GstSample * sample,
              glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f,  1.0f);
              glTexCoord2f(0.0f, 1.0f); glVertex3f(-1.0f,  1.0f,  1.0f);
              glTexCoord2f(1.0f, 1.0f); glVertex3f(-1.0f,  1.0f, -1.0f);
-    glEnd(); 
+    glEnd();
+
+    glLoadIdentity();
+    glDisable(GL_DEPTH_TEST);
+    glBindTexture (GL_TEXTURE_2D, 0);
 
     gst_video_frame_unmap (&v_frame);
 

diff --git a/tests/examples/gl/qt/qglwidgetvideooverlay/pipeline.cpp b/tests/examples/gl/qt/qglwidgetvideooverlay/pipeline.cpp
index daf246a500110ba2d31cc30b027d5c521e0c4c50..301d3b614c0c169343efded3bd80e01f7569ac02 100644 (file)
--- a/tests/examples/gl/qt/qglwidgetvideooverlay/pipeline.cpp
+++ b/tests/examples/gl/qt/qglwidgetvideooverlay/pipeline.cpp
@@ -242,6 +242,10 @@ gboolean Pipeline::drawCallback (GstElement * gl_sink, void *context, GstSample
              glTexCoord2f(1.0, 1.0f); glVertex3f(-1.0f,  1.0f, -1.0f);
     glEnd();
 
+    glLoadIdentity();
+    glDisable(GL_DEPTH_TEST);
+    glBindTexture (GL_TEXTURE_2D, 0);
+
     gst_video_frame_unmap (&v_frame);
 
        xrot+=0.03f;

diff --git a/tests/examples/gl/qt/qglwtextureshare/qglrenderer.cpp b/tests/examples/gl/qt/qglwtextureshare/qglrenderer.cpp
index ee9c61ea788e6651a3dfc0a249ff129ea1d7b2e9..629cc895ff00f7964d7205a70dbf740221e4df79 100644 (file)
--- a/tests/examples/gl/qt/qglwtextureshare/qglrenderer.cpp
+++ b/tests/examples/gl/qt/qglwtextureshare/qglrenderer.cpp
@@ -28,7 +28,7 @@
 #include <GL/glx.h>
 
 #include <gst/video/video.h>
-#include <gst/gl/gstglmemory.h>
+#include <gst/gl/gl.h>
 
 #if GST_GL_HAVE_PLATFORM_GLX
 #include <QX11Info>
@@ -266,6 +266,8 @@ QGLRenderer::paintGL ()
     yrot += 0.2f;
     zrot += 0.4f;
 
+    glLoadIdentity();
+    glDisable(GL_DEPTH_TEST);
     glBindTexture (GL_TEXTURE_2D, 0);
 
     gst_video_frame_unmap (&v_frame);