[cogl/rstrode/wip/prepare-for-mutter-merge: 2/12] renderer: drop GDL support

[Ray Strode <halfline src gnome org>]

commit 79ab009cda1a2f8d5b397e35f21f3cd6b2f059d5
Author: Ray Strode <rstrode redhat com>
Date:   Tue Jan 12 16:30:03 2016 -0500

    renderer: drop GDL support

 cogl/Makefile.am                          |    5 -
 cogl/cogl-display-private.h               |    4 -
 cogl/cogl-display.c                       |   15 --
 cogl/cogl-display.h                       |   20 --
 cogl/cogl-renderer.c                      |    6 -
 cogl/cogl-renderer.h                      |    2 -
 cogl/cogl.symbols                         |    4 -
 cogl/winsys/cogl-winsys-egl-gdl-private.h |   39 ---
 cogl/winsys/cogl-winsys-egl-gdl.c         |  380 -----------------------------
 configure.ac                              |   31 ---
 10 files changed, 0 insertions(+), 506 deletions(-)
---
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index 1c39712..ebd062e 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -482,11 +482,6 @@ cogl_sources_c += \
        winsys/cogl-winsys-egl-x11.c \
        winsys/cogl-winsys-egl-x11-private.h
 endif
-if SUPPORT_EGL_PLATFORM_GDL
-cogl_sources_c += \
-       winsys/cogl-winsys-egl-gdl.c \
-       winsys/cogl-winsys-egl-gdl-private.h
-endif
 if SUPPORT_EGL_PLATFORM_ANDROID
 cogl_sources_c += \
        winsys/cogl-winsys-egl-android.c \
diff --git a/cogl/cogl-display-private.h b/cogl/cogl-display-private.h
index db72984..9788435 100644
--- a/cogl/cogl-display-private.h
+++ b/cogl/cogl-display-private.h
@@ -48,10 +48,6 @@ struct _CoglDisplay
   struct wl_display *wayland_compositor_display;
 #endif
 
-#ifdef COGL_HAS_EGL_PLATFORM_GDL_SUPPORT
-  gdl_plane_id_t gdl_plane;
-#endif
-
   void *winsys;
 };
 
diff --git a/cogl/cogl-display.c b/cogl/cogl-display.c
index ced922f..039e881 100644
--- a/cogl/cogl-display.c
+++ b/cogl/cogl-display.c
@@ -104,10 +104,6 @@ cogl_display_new (CoglRenderer *renderer,
 
   display->setup = FALSE;
 
-#ifdef COGL_HAS_EGL_PLATFORM_GDL_SUPPORT
-  display->gdl_plane = GDL_PLANE_ID_UPP_C;
-#endif
-
   display = _cogl_display_object_new (display);
 
   cogl_display_set_onscreen_template (display, onscreen_template);
@@ -159,17 +155,6 @@ cogl_display_setup (CoglDisplay *display,
   return TRUE;
 }
 
-#ifdef COGL_HAS_EGL_PLATFORM_GDL_SUPPORT
-void
-cogl_gdl_display_set_plane (CoglDisplay *display,
-                            gdl_plane_id_t plane)
-{
-  _COGL_RETURN_IF_FAIL (display->setup == FALSE);
-
-  display->gdl_plane = plane;
-}
-#endif
-
 #ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
 void
 cogl_wayland_display_set_compositor_display (CoglDisplay *display,
diff --git a/cogl/cogl-display.h b/cogl/cogl-display.h
index ae3f3c9..47720a3 100644
--- a/cogl/cogl-display.h
+++ b/cogl/cogl-display.h
@@ -46,10 +46,6 @@
 
 COGL_BEGIN_DECLS
 
-#ifdef COGL_HAS_EGL_PLATFORM_GDL_SUPPORT
-#include <libgdl.h>
-#endif
-
 /**
  * SECTION:cogl-display
  * @short_description: Common aspects of a display pipeline
@@ -198,22 +194,6 @@ CoglBool
 cogl_display_setup (CoglDisplay *display,
                     CoglError **error);
 
-#ifdef COGL_HAS_EGL_PLATFORM_GDL_SUPPORT
-/**
- * cogl_gdl_display_set_plane:
- * @display: a #CoglDisplay
- * @plane: the GDL plane id
- *
- * Request that Cogl output to a specific GDL overlay @plane.
- *
- * Since: 1.10
- * Stability: unstable
- */
-void
-cogl_gdl_display_set_plane (CoglDisplay *display,
-                            gdl_plane_id_t plane);
-#endif
-
 /**
  * cogl_is_display:
  * @object: A #CoglObject pointer
diff --git a/cogl/cogl-renderer.c b/cogl/cogl-renderer.c
index a518a18..bae3a01 100644
--- a/cogl/cogl-renderer.c
+++ b/cogl/cogl-renderer.c
@@ -60,9 +60,6 @@
 #ifdef COGL_HAS_EGL_PLATFORM_KMS_SUPPORT
 #include "cogl-winsys-egl-kms-private.h"
 #endif
-#ifdef COGL_HAS_EGL_PLATFORM_GDL_SUPPORT
-#include "cogl-winsys-egl-gdl-private.h"
-#endif
 #ifdef COGL_HAS_EGL_PLATFORM_ANDROID_SUPPORT
 #include "cogl-winsys-egl-android-private.h"
 #endif
@@ -207,9 +204,6 @@ static CoglWinsysVtableGetter _cogl_winsys_vtable_getters[] =
 #ifdef COGL_HAS_EGL_PLATFORM_KMS_SUPPORT
   _cogl_winsys_egl_kms_get_vtable,
 #endif
-#ifdef COGL_HAS_EGL_PLATFORM_GDL_SUPPORT
-  _cogl_winsys_egl_gdl_get_vtable,
-#endif
 #ifdef COGL_HAS_EGL_PLATFORM_ANDROID_SUPPORT
   _cogl_winsys_egl_android_get_vtable,
 #endif
diff --git a/cogl/cogl-renderer.h b/cogl/cogl-renderer.h
index 5db2173..e9d18b8 100644
--- a/cogl/cogl-renderer.h
+++ b/cogl/cogl-renderer.h
@@ -164,7 +164,6 @@ cogl_renderer_new (void);
  * @COGL_WINSYS_ID_GLX: Use the GLX window system binding API
  * @COGL_WINSYS_ID_EGL_XLIB: Use EGL with the X window system via XLib
  * @COGL_WINSYS_ID_EGL_NULL: Use EGL with the PowerVR NULL window system
- * @COGL_WINSYS_ID_EGL_GDL: Use EGL with the GDL platform
  * @COGL_WINSYS_ID_EGL_WAYLAND: Use EGL with the Wayland window system
  * @COGL_WINSYS_ID_EGL_KMS: Use EGL with the KMS platform
  * @COGL_WINSYS_ID_EGL_ANDROID: Use EGL with the Android platform
@@ -184,7 +183,6 @@ typedef enum
   COGL_WINSYS_ID_GLX,
   COGL_WINSYS_ID_EGL_XLIB,
   COGL_WINSYS_ID_EGL_NULL,
-  COGL_WINSYS_ID_EGL_GDL,
   COGL_WINSYS_ID_EGL_WAYLAND,
   COGL_WINSYS_ID_EGL_KMS,
   COGL_WINSYS_ID_EGL_ANDROID,
diff --git a/cogl/cogl.symbols b/cogl/cogl.symbols
index c3b9f5a..5ae0118 100644
--- a/cogl/cogl.symbols
+++ b/cogl/cogl.symbols
@@ -322,10 +322,6 @@ cogl_frame_info_get_output
 cogl_frame_info_get_presentation_time
 cogl_frame_info_get_refresh_rate
 
-#ifdef COGL_HAS_EGL_PLATFORM_GDL_SUPPORT
-cogl_gdl_display_set_plane
-#endif
-
 cogl_frustum
 
 cogl_get_backface_culling_enabled
diff --git a/configure.ac b/configure.ac
index 8d226d7..3e88e38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1009,37 +1009,6 @@ AS_IF([test "x$SUPPORT_SDL2" = "xyes" -a "x$SUPPORT_SDL" = "xyes"],
 EGL_PLATFORM_COUNT=0
 
 AC_ARG_ENABLE(
-  [gdl-egl-platform],
-  [AC_HELP_STRING([--enable-gdl-egl-platform=@<:@no/yes@:>@], [Enable support for the GDL egl platform 
@<:@default=no@:>@])],
-  [],
-  enable_gdl_egl_platform=no
-)
-AS_IF([test "x$enable_gdl_egl_platform" = "xyes"],
-      [
-        EGL_PLATFORM_COUNT=$((EGL_PLATFORM_COUNT+1))
-        NEED_EGL=yes
-        EGL_PLATFORMS="$EGL_PLATFORMS gdl"
-
-        AC_CHECK_HEADERS(
-          [libgdl.h],
-          [],
-          [
-            AC_CHECK_HEADERS(
-              [CE4100/libgdl.h],
-              [
-               COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS -I/usr/include/CE4100"
-              ],
-              [AC_MSG_ERROR([libgdl.h not found])])
-          ])
-
-        COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lgdl"
-
-        COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_PLATFORM_GDL_SUPPORT"
-      ])
-AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_GDL,
-               [test "x$enable_gdl_egl_platform" = "xyes"])
-
-AC_ARG_ENABLE(
   [wayland-egl-platform],
   [AC_HELP_STRING([--enable-wayland-egl-platform=@<:@no/yes@:>@], [Enable support for the Wayland egl 
platform @<:@default=no@:>@])],
   [],