mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-02 16:52:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl: rename platform cocoa to cgl

Browse source 
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
This commit is contained in:
Julien Isorce 2014-05-27 08:46:16 +01:00
parent 81716909fe
commit fbe6dd9c5f
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure.ac
View file

@ -1174,7 +1174,7 @@ dnl PLATFORM's
GST_GL_HAVE_PLATFORM_EGL=0 GST_GL_HAVE_PLATFORM_EGL=0
GST_GL_HAVE_PLATFORM_GLX=0 GST_GL_HAVE_PLATFORM_GLX=0
GST_GL_HAVE_PLATFORM_WGL=0 GST_GL_HAVE_PLATFORM_WGL=0
GST_GL_HAVE_PLATFORM_COCOA=0 GST_GL_HAVE_PLATFORM_CGL=0
GST_GL_HAVE_PLATFORM_EAGL=0 GST_GL_HAVE_PLATFORM_EAGL=0
if test "x$USE_EGL" = "xyes"; then if test "x$USE_EGL" = "xyes"; then
@ -1190,8 +1190,8 @@ if test "x$USE_WGL" = "xyes"; then
GST_GL_HAVE_PLATFORM_WGL=1 GST_GL_HAVE_PLATFORM_WGL=1
fi fi
if test "x$USE_COCOA" = "xyes"; then if test "x$USE_COCOA" = "xyes"; then
GL_PLATFORMS="cocoa $GL_PLATFORMS" GL_PLATFORMS="cgl $GL_PLATFORMS"
GST_GL_HAVE_PLATFORM_COCOA=1 GST_GL_HAVE_PLATFORM_CGL=1
fi fi
if test "x$USE_EAGL" = "xyes"; then if test "x$USE_EAGL" = "xyes"; then
GL_PLATFORMS="eagl $GL_PLATFORMS" GL_PLATFORMS="eagl $GL_PLATFORMS"
@ -1202,7 +1202,7 @@ GL_CONFIG_DEFINES="$GL_CONFIG_DEFINES
#define GST_GL_HAVE_PLATFORM_EGL $GST_GL_HAVE_PLATFORM_EGL #define GST_GL_HAVE_PLATFORM_EGL $GST_GL_HAVE_PLATFORM_EGL
#define GST_GL_HAVE_PLATFORM_GLX $GST_GL_HAVE_PLATFORM_GLX #define GST_GL_HAVE_PLATFORM_GLX $GST_GL_HAVE_PLATFORM_GLX
#define GST_GL_HAVE_PLATFORM_WGL $GST_GL_HAVE_PLATFORM_WGL #define GST_GL_HAVE_PLATFORM_WGL $GST_GL_HAVE_PLATFORM_WGL
#define GST_GL_HAVE_PLATFORM_COCOA $GST_GL_HAVE_PLATFORM_COCOA #define GST_GL_HAVE_PLATFORM_CGL $GST_GL_HAVE_PLATFORM_CGL
#define GST_GL_HAVE_PLATFORM_EAGL $GST_GL_HAVE_PLATFORM_EAGL #define GST_GL_HAVE_PLATFORM_EAGL $GST_GL_HAVE_PLATFORM_EAGL
" "

6
gst-libs/gst/gl/gstglcontext.c
View file

@ -55,7 +55,7 @@
#if GST_GL_HAVE_PLATFORM_EGL #if GST_GL_HAVE_PLATFORM_EGL
#include "egl/gstglcontext_egl.h" #include "egl/gstglcontext_egl.h"
#endif #endif
#if GST_GL_HAVE_PLATFORM_COCOA #if GST_GL_HAVE_PLATFORM_CGL
#include "cocoa/gstglcontext_cocoa.h" #include "cocoa/gstglcontext_cocoa.h"
#endif #endif
#if GST_GL_HAVE_PLATFORM_WGL #if GST_GL_HAVE_PLATFORM_WGL
@ -261,8 +261,8 @@ gst_gl_context_new (GstGLDisplay * display)
if (!context && (!user_choice || g_strstr_len (user_choice, 7, "egl"))) if (!context && (!user_choice || g_strstr_len (user_choice, 7, "egl")))
context = GST_GL_CONTEXT (gst_gl_context_egl_new ()); context = GST_GL_CONTEXT (gst_gl_context_egl_new ());
#endif #endif
#if GST_GL_HAVE_PLATFORM_COCOA #if GST_GL_HAVE_PLATFORM_CGL
if (!context && (!user_choice || g_strstr_len (user_choice, 5, "cocoa"))) if (!context && (!user_choice || g_strstr_len (user_choice, 5, "cgl")))
context = GST_GL_CONTEXT (gst_gl_context_cocoa_new ()); context = GST_GL_CONTEXT (gst_gl_context_cocoa_new ());
#endif #endif
#if GST_GL_HAVE_PLATFORM_GLX #if GST_GL_HAVE_PLATFORM_GLX

4
tests/examples/gl/qt/qglwtextureshare/glcontextid.h
View file

@ -30,7 +30,7 @@
#include <windows.h> #include <windows.h>
#include <Wingdi.h> #include <Wingdi.h>
#include <GL/gl.h> #include <GL/gl.h>
#elif defined (GST_GL_HAVE_PLATFORM_COCOA) #elif defined (GST_GL_HAVE_PLATFORM_CGL)
#include <OpenGL/OpenGL.h> #include <OpenGL/OpenGL.h>
class NSOpenGLContext; class NSOpenGLContext;
#else #else
@ -47,7 +47,7 @@
HGLRC contextId; HGLRC contextId;
HDC dc; HDC dc;
} GLContextID; } GLContextID;
#elif defined(GST_GL_HAVE_PLATFORM_COCOA) #elif defined(GST_GL_HAVE_PLATFORM_CGL)
typedef struct _tagGLContextID typedef struct _tagGLContextID
{ {
NSOpenGLContext* contextId; NSOpenGLContext* contextId;

4
tests/examples/gl/qt/qglwtextureshare/qglrenderer.cpp
View file

@ -62,8 +62,8 @@ QGLRenderer::initializeGL()
/* FIXME: Allow the choice at runtime */ /* FIXME: Allow the choice at runtime */
#if defined(GST_GL_HAVE_PLATFORM_WGL) #if defined(GST_GL_HAVE_PLATFORM_WGL)
context = gst_gl_context_new_wrapped (display, (guintptr) wglGetCurrentContext (), GST_GL_PLATFORM_WGL, GST_GL_API_OPENGL); context = gst_gl_context_new_wrapped (display, (guintptr) wglGetCurrentContext (), GST_GL_PLATFORM_WGL, GST_GL_API_OPENGL);
#elif defined (GST_GL_HAVE_PLATFORM_COCOA) #elif defined (GST_GL_HAVE_PLATFORM_CGL)
context = gst_gl_context_new_wrapped (display, (guintptr) qt_current_nsopengl_context(), GST_GL_PLATFORM_COCOA, GST_GL_API_OPENGL); 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) #elif defined(GST_GL_HAVE_PLATFORM_GLX)
context = gst_gl_context_new_wrapped (display, (guintptr) glXGetCurrentContext (), GST_GL_PLATFORM_GLX, GST_GL_API_OPENGL); context = gst_gl_context_new_wrapped (display, (guintptr) glXGetCurrentContext (), GST_GL_PLATFORM_GLX, GST_GL_API_OPENGL);
#endif #endif