From fbe6dd9c5f645ba2af050d46b080dc180c37c165 Mon Sep 17 00:00:00 2001
From: Julien Isorce <julien.isorce@gmail.com>
Date: Tue, 27 May 2014 08:46:16 +0100
Subject: [PATCH] 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
---
 configure.ac                                          | 8 ++++----
 gst-libs/gst/gl/gstglcontext.c                        | 6 +++---
 tests/examples/gl/qt/qglwtextureshare/glcontextid.h   | 4 ++--
 tests/examples/gl/qt/qglwtextureshare/qglrenderer.cpp | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index b4cf876edb..ffc861c88b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1174,7 +1174,7 @@ dnl PLATFORM's
 GST_GL_HAVE_PLATFORM_EGL=0
 GST_GL_HAVE_PLATFORM_GLX=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
 
 if test "x$USE_EGL" = "xyes"; then
@@ -1190,8 +1190,8 @@ if test "x$USE_WGL" = "xyes"; then
   GST_GL_HAVE_PLATFORM_WGL=1
 fi
 if test "x$USE_COCOA" = "xyes"; then
-  GL_PLATFORMS="cocoa $GL_PLATFORMS"
-  GST_GL_HAVE_PLATFORM_COCOA=1
+  GL_PLATFORMS="cgl $GL_PLATFORMS"
+  GST_GL_HAVE_PLATFORM_CGL=1
 fi
 if test "x$USE_EAGL" = "xyes"; then
   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_GLX $GST_GL_HAVE_PLATFORM_GLX
 #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
 "
 
diff --git a/gst-libs/gst/gl/gstglcontext.c b/gst-libs/gst/gl/gstglcontext.c
index 550d3e310e..4eb0b50d08 100644
--- a/gst-libs/gst/gl/gstglcontext.c
+++ b/gst-libs/gst/gl/gstglcontext.c
@@ -55,7 +55,7 @@
 #if GST_GL_HAVE_PLATFORM_EGL
 #include "egl/gstglcontext_egl.h"
 #endif
-#if GST_GL_HAVE_PLATFORM_COCOA
+#if GST_GL_HAVE_PLATFORM_CGL
 #include "cocoa/gstglcontext_cocoa.h"
 #endif
 #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")))
     context = GST_GL_CONTEXT (gst_gl_context_egl_new ());
 #endif
-#if GST_GL_HAVE_PLATFORM_COCOA
-  if (!context && (!user_choice || g_strstr_len (user_choice, 5, "cocoa")))
+#if GST_GL_HAVE_PLATFORM_CGL
+  if (!context && (!user_choice || g_strstr_len (user_choice, 5, "cgl")))
     context = GST_GL_CONTEXT (gst_gl_context_cocoa_new ());
 #endif
 #if GST_GL_HAVE_PLATFORM_GLX
diff --git a/tests/examples/gl/qt/qglwtextureshare/glcontextid.h b/tests/examples/gl/qt/qglwtextureshare/glcontextid.h
index c6a240c610..a6c846013b 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 303e4f110f..c590ac7a3a 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