diff options
author | Matthew Waters <ystreet00@gmail.com> | 2013-01-16 15:23:49 +1100 |
---|---|---|
committer | Sebastian Dröge <slomo@circular-chaos.org> | 2013-06-29 10:06:41 +0200 |
commit | f90e2cb094ee05ef944d380ba329219d426eaf48 (patch) | |
tree | c20bc5e140d339b2ee2e450db92eb08014f62918 /tests | |
parent | b88081febb67160fbb5c1344931198529a45234e (diff) |
tests/examples: remove dependency on glew
Diffstat (limited to 'tests')
19 files changed, 32 insertions, 69 deletions
diff --git a/tests/examples/clutter/cluttershare.c b/tests/examples/clutter/cluttershare.c index 5772f95..0257515 100644 --- a/tests/examples/clutter/cluttershare.c +++ b/tests/examples/clutter/cluttershare.c @@ -18,19 +18,13 @@ * Boston, MA 02110-1301, USA. */ -#include <GL/glew.h> -#ifdef WIN32 -#include <GL/wglew.h> -#else -#include <GL/glxew.h> -#endif - #include <GL/gl.h> #define CLUTTER_VERSION_MIN_REQUIRED CLUTTER_VERSION_1_8 #include <clutter/clutter.h> #ifndef WIN32 #include <clutter/x11/clutter-x11.h> +#include <GL/glx.h> #endif #include <gst/gst.h> @@ -236,7 +230,6 @@ int main (int argc, char *argv[]) { ClutterInitError clutter_err = CLUTTER_INIT_ERROR_UNKNOWN; - GLenum err = 0; #ifdef WIN32 HGLRC clutter_gl_context = 0; HDC clutter_dc = 0; @@ -266,23 +259,13 @@ main (int argc, char *argv[]) g_print ("clutter version: %s\n", CLUTTER_VERSION_S); clutter_set_default_frame_rate (2); - /* init glew */ - - err = glewInit (); - if (err != GLEW_OK) - g_debug ("failed to init GLEW: %s", glewGetErrorString (err)); - /* avoid to dispatch unecesary events */ - clutter_ungrab_keyboard (); clutter_ungrab_pointer (); /* retrieve and turn off clutter opengl context */ - stage = clutter_stage_get_default (); - /* retrieve and turn off clutter opengl context */ - #ifdef WIN32 clutter_gl_context = wglGetCurrentContext (); clutter_dc = wglGetCurrentDC (); @@ -312,7 +295,6 @@ main (int argc, char *argv[]) gst_object_unref (bus); /* clutter_gl_context is an external OpenGL context with which gst-plugins-gl want to share textures */ - glfilter = gst_bin_get_by_name (GST_BIN (pipeline), "glfiltercube0"); g_object_set (G_OBJECT (glfilter), "external-opengl-context", clutter_gl_context, NULL); @@ -320,7 +302,6 @@ main (int argc, char *argv[]) /* NULL to PAUSED state pipeline to make sure the gst opengl context is created and * shared with the clutter one */ - gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PAUSED); state = GST_STATE_PAUSED; if (gst_element_get_state (GST_ELEMENT (pipeline), &state, NULL, @@ -330,7 +311,6 @@ main (int argc, char *argv[]) } /* turn on back clutter opengl context */ - #ifdef WIN32 wglMakeCurrent (clutter_dc, clutter_gl_context); #else @@ -338,14 +318,12 @@ main (int argc, char *argv[]) #endif /* clutter stage */ - clutter_actor_set_size (stage, 640, 480); clutter_actor_set_position (stage, 0, 0); clutter_stage_set_title (CLUTTER_STAGE (stage), "clutter and gst-plugins-gl"); clutter_texture = setup_stage (CLUTTER_STAGE (stage)); /* append a gst-gl texture to this queue when you do not need it no more */ - queue_input_buf = g_async_queue_new (); queue_output_buf = g_async_queue_new (); g_object_set_data (G_OBJECT (clutter_texture), "queue_input_buf", @@ -354,7 +332,6 @@ main (int argc, char *argv[]) queue_output_buf); /* set a callback to retrieve the gst gl textures */ - fakesink = gst_bin_get_by_name (GST_BIN (pipeline), "fakesink0"); g_object_set (G_OBJECT (fakesink), "signal-handoffs", TRUE, NULL); g_signal_connect (fakesink, "handoff", G_CALLBACK (on_gst_buffer), @@ -362,11 +339,9 @@ main (int argc, char *argv[]) g_object_unref (fakesink); /* play gst */ - gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING); /* main loop */ - clutter_main (); /* before to deinitialize the gst-gl-opengl context, @@ -381,14 +356,12 @@ main (int argc, char *argv[]) clutter_threads_leave (); /* stop and clean up the pipeline */ - gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL); g_object_unref (pipeline); /* make sure there is no pending gst gl buffer in the communication queues * between clutter and gst-gl */ - while (g_async_queue_length (queue_input_buf) > 0) { GstBuffer *buf = g_async_queue_pop (queue_input_buf); gst_buffer_unref (buf); diff --git a/tests/examples/clutter/cluttershare.cbp b/tests/examples/clutter/cluttershare.cbp index 11f9177..cb4907e 100644 --- a/tests/examples/clutter/cluttershare.cbp +++ b/tests/examples/clutter/cluttershare.cbp @@ -56,7 +56,6 @@ <Add library="pango-1.0" /> <Add library="gdk_pixbuf-2.0" /> <Add library="cairo" /> - <Add library="glew32" /> <Add library="glu32" /> <Add library="opengl32" /> <Add library="gdi32" /> diff --git a/tests/examples/generic/cube/cube.vcproj b/tests/examples/generic/cube/cube.vcproj index e6b2dcb..aefb6ad 100644 --- a/tests/examples/generic/cube/cube.vcproj +++ b/tests/examples/generic/cube/cube.vcproj @@ -62,7 +62,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="gstreamer-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib" + AdditionalDependencies="gstreamer-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib" LinkIncremental="2" AdditionalLibraryDirectories="C:\gstreamer\lib" GenerateDebugInformation="true" @@ -137,7 +137,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="gstreamer-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib" + AdditionalDependencies="gstreamer-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib" LinkIncremental="1" AdditionalLibraryDirectories="C:\gstreamer\lib" GenerateDebugInformation="true" diff --git a/tests/examples/generic/cube/main.cpp b/tests/examples/generic/cube/main.cpp index ca48680..a611e31 100644 --- a/tests/examples/generic/cube/main.cpp +++ b/tests/examples/generic/cube/main.cpp @@ -18,7 +18,8 @@ * Boston, MA 02110-1301, USA. */ -#include <GL/glew.h> +#include <GL/gl.h> +#include <GL/glu.h> #include <gst/gst.h> #include <iostream> diff --git a/tests/examples/generic/cubeyuv/cubeyuv.vcproj b/tests/examples/generic/cubeyuv/cubeyuv.vcproj index 13d2d68..1d20859 100644 --- a/tests/examples/generic/cubeyuv/cubeyuv.vcproj +++ b/tests/examples/generic/cubeyuv/cubeyuv.vcproj @@ -62,7 +62,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="gstreamer-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib" + AdditionalDependencies="gstreamer-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib" LinkIncremental="2" AdditionalLibraryDirectories="C:\gstreamer\lib" GenerateDebugInformation="true" @@ -137,7 +137,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="gstreamer-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib" + AdditionalDependencies="gstreamer-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib" LinkIncremental="1" AdditionalLibraryDirectories="C:\gstreamer\lib" GenerateDebugInformation="true" diff --git a/tests/examples/generic/cubeyuv/main.cpp b/tests/examples/generic/cubeyuv/main.cpp index 1673f8f..7209158 100644 --- a/tests/examples/generic/cubeyuv/main.cpp +++ b/tests/examples/generic/cubeyuv/main.cpp @@ -18,7 +18,8 @@ * Boston, MA 02110-1301, USA. */ -#include <GL/glew.h> +#include <GL/gl.h> +#include <GL/glu.h> #include <gst/gst.h> #include <iostream> diff --git a/tests/examples/generic/doublecube/doublecube.vcproj b/tests/examples/generic/doublecube/doublecube.vcproj index 35cfd48..db0364b 100644 --- a/tests/examples/generic/doublecube/doublecube.vcproj +++ b/tests/examples/generic/doublecube/doublecube.vcproj @@ -62,7 +62,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="gstreamer-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib" + AdditionalDependencies="gstreamer-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib" LinkIncremental="2" AdditionalLibraryDirectories="C:\gstreamer\lib" GenerateDebugInformation="true" @@ -137,7 +137,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="gstreamer-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib" + AdditionalDependencies="gstreamer-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib" LinkIncremental="1" AdditionalLibraryDirectories="C:\gstreamer\lib" GenerateDebugInformation="true" diff --git a/tests/examples/generic/doublecube/main.cpp b/tests/examples/generic/doublecube/main.cpp index dd7b5cf..4e6fb30 100644 --- a/tests/examples/generic/doublecube/main.cpp +++ b/tests/examples/generic/doublecube/main.cpp @@ -18,7 +18,8 @@ * Boston, MA 02110-1301, USA. */ -#include <GL/glew.h> +#include <GL/gl.h> +#include <GL/glu.h> #include <gst/gst.h> #include <iostream> diff --git a/tests/examples/generic/recordgraphic/Makefile b/tests/examples/generic/recordgraphic/Makefile index 9102717..b7a4359 100644 --- a/tests/examples/generic/recordgraphic/Makefile +++ b/tests/examples/generic/recordgraphic/Makefile @@ -14,17 +14,14 @@ REXE=$(EXE).exe CPPFLAGS=-I../../../../libxml2-2.6.30+.win32/include \ -I../../../../libiconv/include \ -I../../../../glib/include \ - -I../../../../gstreamer/include \ - -I../../../../glew/include + -I../../../../gstreamer/include #ld tool from mingw needs dll too LDFLAGS+=-L../../../../glib/lib \ -L../../../../gstreamer/lib \ - -L../../../../glew/lib \ -L../../../../glib/bin \ - -L../../../../gstreamer/bin/bin \ - -L../../../../glew/bin + -L../../../../gstreamer/bin/bin LIBS+=-lglib-2.0 -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 \ - -lopengl32 -lglu32 -lglew32 -lglew32s + -lopengl32 -lglu32 else # Put Linux-specific stuff here REXE=$(EXE) @@ -32,7 +29,7 @@ CPPFLAGS+=-I/usr/include/gstreamer-1.0 \ -I/usr/include/glib-2.0 \ -I/usr/lib/glib-2.0/include \ -I/usr/include/libxml2 -LIBS+=-lgstreamer-1.0 -lglib-2.0 -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lGLU -lGL -lGLEW +LIBS+=-lgstreamer-1.0 -lglib-2.0 -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lGLU -lGL endif diff --git a/tests/examples/generic/recordgraphic/main.cpp b/tests/examples/generic/recordgraphic/main.cpp index 4fc6d32..6bc1947 100644 --- a/tests/examples/generic/recordgraphic/main.cpp +++ b/tests/examples/generic/recordgraphic/main.cpp @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <GL/glew.h> +#include <GL/gl.h> #include <gst/gst.h> #include <gst/video/video.h> diff --git a/tests/examples/generic/recordgraphic/recordgraphic.vcproj b/tests/examples/generic/recordgraphic/recordgraphic.vcproj index ec23be2..66df375 100644 --- a/tests/examples/generic/recordgraphic/recordgraphic.vcproj +++ b/tests/examples/generic/recordgraphic/recordgraphic.vcproj @@ -62,7 +62,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="gstreamer-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib" + AdditionalDependencies="gstreamer-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib" LinkIncremental="2" AdditionalLibraryDirectories="C:\gstreamer\lib" GenerateDebugInformation="true" @@ -137,7 +137,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="gstreamer-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib" + AdditionalDependencies="gstreamer-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib" LinkIncremental="1" AdditionalLibraryDirectories="C:\gstreamer\lib" GenerateDebugInformation="true" diff --git a/tests/examples/qt/mousevideooverlay/mousevideooverlay.pro b/tests/examples/qt/mousevideooverlay/mousevideooverlay.pro index 9069484..acbc77d 100644 --- a/tests/examples/qt/mousevideooverlay/mousevideooverlay.pro +++ b/tests/examples/qt/mousevideooverlay/mousevideooverlay.pro @@ -22,8 +22,7 @@ LIBS += -L"C:/gstreamer/lib" \ -lgobject-2.0 \ -lgthread-2.0 \ -lopengl32 \ - -lglu32 \ - -lglew32 + -lglu32 } unix { @@ -42,8 +41,7 @@ LIBS += -lgstreamer-video \ -lgobject-2.0 \ -lgthread-2.0 \ -lGLU \ - -lGL \ - -lGLEW + -lGL } DEPENDPATH += . diff --git a/tests/examples/qt/mousevideooverlay/mousevideooverlay.vcproj b/tests/examples/qt/mousevideooverlay/mousevideooverlay.vcproj index 86b5c42..e4b7b18 100644 --- a/tests/examples/qt/mousevideooverlay/mousevideooverlay.vcproj +++ b/tests/examples/qt/mousevideooverlay/mousevideooverlay.vcproj @@ -56,7 +56,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="qtmain.lib QtCore4.lib QtGui4.lib gstreamer-1.0.lib gstvideo-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib" + AdditionalDependencies="qtmain.lib QtCore4.lib QtGui4.lib gstreamer-1.0.lib gstvideo-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib" OutputFile="$(OutDir)\$(ProjectName).exe" AdditionalLibraryDirectories=""$(QTDIR)\lib";C:\gstreamer\lib" GenerateDebugInformation="false" @@ -127,7 +127,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="qtmaind.lib QtCored4.lib QtGuid4.lib gstreamer-1.0.lib gstvideo-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib" + AdditionalDependencies="qtmaind.lib QtCored4.lib QtGuid4.lib gstreamer-1.0.lib gstvideo-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib" OutputFile="$(OutDir)\$(ProjectName).exe" AdditionalLibraryDirectories=""$(QTDIR)\lib";C:\gstreamer\lib" GenerateDebugInformation="true" diff --git a/tests/examples/qt/mousevideooverlay/pipeline.cpp b/tests/examples/qt/mousevideooverlay/pipeline.cpp index f07ae15..66a75ff 100644 --- a/tests/examples/qt/mousevideooverlay/pipeline.cpp +++ b/tests/examples/qt/mousevideooverlay/pipeline.cpp @@ -19,7 +19,7 @@ */ #include <gst/video/videooverlay.h> -#include <GL/glew.h> +#include <GL/gl.h> #include "pipeline.h" Pipeline::Pipeline(const WId id, const QString videoLocation): diff --git a/tests/examples/qt/qglwidgetvideooverlay/pipeline.cpp b/tests/examples/qt/qglwidgetvideooverlay/pipeline.cpp index f74a584..2d06a7b 100644 --- a/tests/examples/qt/qglwidgetvideooverlay/pipeline.cpp +++ b/tests/examples/qt/qglwidgetvideooverlay/pipeline.cpp @@ -19,7 +19,7 @@ */ #include <gst/video/videooverlay.h> -#include <GL/glew.h> +#include <GL/gl.h> #include "pipeline.h" Pipeline::Pipeline(const WId id, const QString videoLocation): diff --git a/tests/examples/qt/qglwidgetvideooverlay/qglwidgetvideooverlay.pro b/tests/examples/qt/qglwidgetvideooverlay/qglwidgetvideooverlay.pro index 43cab4b..2fa56e8 100644 --- a/tests/examples/qt/qglwidgetvideooverlay/qglwidgetvideooverlay.pro +++ b/tests/examples/qt/qglwidgetvideooverlay/qglwidgetvideooverlay.pro @@ -23,8 +23,7 @@ LIBS += -L"C:/gstreamer/lib" \ -lgobject-2.0 \ -lgthread-2.0 \ -lopengl32 \ - -lglu32 \ - -lglew32 + -lglu32 } unix { @@ -43,8 +42,7 @@ LIBS += -lgstreamer-1.0 \ -lgobject-2.0 \ -lgthread-2.0 \ -lGLU \ - -lGL \ - -lGLEW + -lGL } DEPENDPATH += . diff --git a/tests/examples/qt/qglwidgetvideooverlay/qglwidgetvideooverlay.vcproj b/tests/examples/qt/qglwidgetvideooverlay/qglwidgetvideooverlay.vcproj index da0217e..4abca4b 100644 --- a/tests/examples/qt/qglwidgetvideooverlay/qglwidgetvideooverlay.vcproj +++ b/tests/examples/qt/qglwidgetvideooverlay/qglwidgetvideooverlay.vcproj @@ -55,7 +55,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="qtmain.lib QtCore4.lib QtGui4.lib QtOpenGL4.lib opengl32.lib glu32.lib gstreamer-1.0.lib gstvideo-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib glew32.lib" + AdditionalDependencies="qtmain.lib QtCore4.lib QtGui4.lib QtOpenGL4.lib opengl32.lib glu32.lib gstreamer-1.0.lib gstvideo-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib" OutputFile="$(OutDir)\$(ProjectName).exe" AdditionalLibraryDirectories=""$(QTDIR)\lib";C:\gstreamer\lib" GenerateDebugInformation="false" @@ -126,7 +126,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="qtmaind.lib QtCored4.lib QtGuid4.lib QtOpenGLd4.lib opengl32.lib glu32.lib gstreamer-1.0.lib gstvideo-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib glew32.lib" + AdditionalDependencies="qtmaind.lib QtCored4.lib QtGuid4.lib QtOpenGLd4.lib opengl32.lib glu32.lib gstreamer-1.0.lib gstvideo-1.0.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib" OutputFile="$(OutDir)\$(ProjectName).exe" AdditionalLibraryDirectories=""$(QTDIR)\lib";C:\gstreamer\lib" GenerateDebugInformation="true" diff --git a/tests/examples/qt/qglwtextureshare/glcontextid.h b/tests/examples/qt/qglwtextureshare/glcontextid.h index e400832..7b14433 100644 --- a/tests/examples/qt/qglwtextureshare/glcontextid.h +++ b/tests/examples/qt/qglwtextureshare/glcontextid.h @@ -27,14 +27,12 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <Wingdi.h> - #include <GL/glew.h> #include <GL/gl.h> #elif defined (Q_OS_MAC) #include <OpenGL/OpenGL.h> class NSOpenGLContext; #else #include <X11/Xlib.h> - //#include <GL/glxew.h> #include <GL/gl.h> #include <GL/glx.h> #endif diff --git a/tests/examples/qt/qglwtextureshare/qglwtextureshare.pro b/tests/examples/qt/qglwtextureshare/qglwtextureshare.pro index 04140fd..c0a7e41 100644 --- a/tests/examples/qt/qglwtextureshare/qglwtextureshare.pro +++ b/tests/examples/qt/qglwtextureshare/qglwtextureshare.pro @@ -25,8 +25,7 @@ LIBS += -L"C:/gstreamer/lib" \ -lgthread-2.0 \ -lgstvideo-1.0 \ -lopengl32 \ - -lglu32 \ - -lglew32 + -lglu32 } unix:!mac { DEFINES += UNIX @@ -42,8 +41,7 @@ unix:!mac { -lgobject-2.0 \ -lgthread-2.0 \ -lGLU \ - -lGL \ - -lGLEW + -lGL } mac { DEFINES += MACOSX @@ -53,7 +51,6 @@ mac { /opt/local/lib/glib-2.0/include \ /opt/local/include/libxml2 LIBS += -L/opt/local/lib \ - -lGLEW \ -lgstreamer-1.0 \ -lgstapp-1.0 \ -lgstvideo-1.0 \ |