diff options
| author | Julien Isorce <julien.isorce@gmail.com> | 2014-05-27 08:46:16 +0100 |
|---|---|---|
| committer | Julien Isorce <julien.isorce@gmail.com> | 2014-05-27 08:46:16 +0100 |
| commit | fbe6dd9c5f645ba2af050d46b080dc180c37c165 (patch) | |
| tree | 1b33a8238a3b331f4ea159171397b594e3713422 /tests | |
| parent | 81716909fe34804655a7e962dce55f7fbf60cb66 (diff) | |
| download | gstreamer-plugins-bad-fbe6dd9c5f645ba2af050d46b080dc180c37c165.tar.gz | |
gl: rename platform cocoa to cgl
Before:
GST_GL_PLATFORM=cocoa GST_GL_WINDOW=cocoa
gst-launch-1.0 videotestsrc ! glimagesink
After:
GST_GL_PLATFORM=cgl GST_GL_WINDOW=cocoa
gst-launch-1.0 videotestsrc ! glimagesink
but still pass --enable-cocoa to configure script
because currently it can only be used with cocoa API.
We could later have cgl/gstglcontext_cgl.h that manages
a CGLContextObj directly and cocoa/gstglcontext_cocoa.h
would just wrap it.
So that it could be used with other Apple's window APIs.
https://bugzilla.gnome.org/show_bug.cgi?id=729245
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/examples/gl/qt/qglwtextureshare/glcontextid.h | 4 | ||||
| -rw-r--r-- | tests/examples/gl/qt/qglwtextureshare/qglrenderer.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/examples/gl/qt/qglwtextureshare/glcontextid.h b/tests/examples/gl/qt/qglwtextureshare/glcontextid.h index c6a240c61..a6c846013 100644 --- a/tests/examples/gl/qt/qglwtextureshare/glcontextid.h +++ b/tests/examples/gl/qt/qglwtextureshare/glcontextid.h @@ -30,7 +30,7 @@ #include <windows.h> #include <Wingdi.h> #include <GL/gl.h> -#elif defined (GST_GL_HAVE_PLATFORM_COCOA) +#elif defined (GST_GL_HAVE_PLATFORM_CGL) #include <OpenGL/OpenGL.h> class NSOpenGLContext; #else @@ -47,7 +47,7 @@ HGLRC contextId; HDC dc; } GLContextID; -#elif defined(GST_GL_HAVE_PLATFORM_COCOA) +#elif defined(GST_GL_HAVE_PLATFORM_CGL) typedef struct _tagGLContextID { NSOpenGLContext* contextId; diff --git a/tests/examples/gl/qt/qglwtextureshare/qglrenderer.cpp b/tests/examples/gl/qt/qglwtextureshare/qglrenderer.cpp index 303e4f110..c590ac7a3 100644 --- a/tests/examples/gl/qt/qglwtextureshare/qglrenderer.cpp +++ b/tests/examples/gl/qt/qglwtextureshare/qglrenderer.cpp @@ -62,8 +62,8 @@ QGLRenderer::initializeGL() /* FIXME: Allow the choice at runtime */ #if defined(GST_GL_HAVE_PLATFORM_WGL) context = gst_gl_context_new_wrapped (display, (guintptr) wglGetCurrentContext (), GST_GL_PLATFORM_WGL, GST_GL_API_OPENGL); -#elif defined (GST_GL_HAVE_PLATFORM_COCOA) - context = gst_gl_context_new_wrapped (display, (guintptr) qt_current_nsopengl_context(), GST_GL_PLATFORM_COCOA, GST_GL_API_OPENGL); +#elif defined (GST_GL_HAVE_PLATFORM_CGL) + context = gst_gl_context_new_wrapped (display, (guintptr) qt_current_nsopengl_context(), GST_GL_PLATFORM_CGL, GST_GL_API_OPENGL); #elif defined(GST_GL_HAVE_PLATFORM_GLX) context = gst_gl_context_new_wrapped (display, (guintptr) glXGetCurrentContext (), GST_GL_PLATFORM_GLX, GST_GL_API_OPENGL); #endif |