[cogl/wip/rstrode/prepare-for-mutter-merge: 7/13] renderer: drop MIR support

[Ray Strode <halfline src gnome org>]

commit caf4fdd60a97d3247951fbb91699fcaf123be6a0
Author: Ray Strode <rstrode redhat com>
Date:   Tue Jan 12 16:49:54 2016 -0500

    renderer: drop MIR support

 cogl/Makefile.am                          |    6 -
 cogl/cogl-mir-renderer.h                  |  145 -----
 cogl/cogl-onscreen-private.h              |    4 -
 cogl/cogl-onscreen.h                      |   59 --
 cogl/cogl-renderer-private.h              |    7 -
 cogl/cogl-renderer.c                      |    6 -
 cogl/cogl-renderer.h                      |    2 -
 cogl/cogl.h                               |    3 -
 cogl/winsys/cogl-winsys-egl-mir-private.h |   39 --
 cogl/winsys/cogl-winsys-egl-mir.c         |  865 -----------------------------
 configure.ac                              |   23 -
 11 files changed, 0 insertions(+), 1159 deletions(-)
---
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index 82aee52..b88d502 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -478,12 +478,6 @@ cogl_sources_c += \
        winsys/cogl-winsys-egl-android.c \
        winsys/cogl-winsys-egl-android-private.h
 endif
-if SUPPORT_EGL_PLATFORM_MIR
-cogl_experimental_h += cogl-mir-renderer.h
-cogl_sources_c += \
-       winsys/cogl-winsys-egl-mir.c \
-       winsys/cogl-winsys-egl-mir-private.h
-endif
 if SUPPORT_EGL
 cogl_experimental_h += cogl-egl.h
 cogl_nodist_experimental_h += cogl-egl-defines.h
diff --git a/cogl/cogl-onscreen-private.h b/cogl/cogl-onscreen-private.h
index 219f443..f982d20 100644
--- a/cogl/cogl-onscreen-private.h
+++ b/cogl/cogl-onscreen-private.h
@@ -69,10 +69,6 @@ struct _CoglOnscreen
   struct wl_surface *foreign_surface;
 #endif
 
-#ifdef COGL_HAS_EGL_PLATFORM_MIR_SUPPORT
-  struct MirSurface *foreign_surface;
-#endif
-
   CoglBool swap_throttled;
 
   CoglList frame_closures;
diff --git a/cogl/cogl-onscreen.h b/cogl/cogl-onscreen.h
index c1a8bd0..7f9fa16 100644
--- a/cogl/cogl-onscreen.h
+++ b/cogl/cogl-onscreen.h
@@ -233,65 +233,6 @@ cogl_wayland_onscreen_resize (CoglOnscreen *onscreen,
                               int           offset_y);
 #endif /* COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT */
 
-#if defined (COGL_HAS_EGL_PLATFORM_MIR_SUPPORT)
-/**
- * cogl_mir_onscreen_get_surface:
- * @onscreen: A #CoglOnscreen framebuffer
- *
- * Allows you to get the internal #MirSurface linked to the given @onscreen.
- * This function might return %NULL if the @onscreen has not been allocated
- * (see cogl_framebuffer_allocate() for more details)
- *
- * Returns: (transfer none): a #MirSurface or %NULL.
- *
- * Since: 1.18
- * Stability: unstable
- */
-struct MirSurface *
-cogl_mir_onscreen_get_surface (CoglOnscreen *onscreen);
-
-/**
- * cogl_mir_onscreen_set_foreign_surface:
- * @onscreen: An unallocated framebuffer.
- * @surface A Mir surface to associate with the @onscreen.
- *
- * Allows you to explicitly notify Cogl of an existing Mir surface to use,
- * which prevents Cogl from allocating a surface for the @onscreen.
- * An allocated surface will not be destroyed when the @onscreen is freed.
- *
- * This function must be called before @onscreen is allocated.
- *
- * Returns: whether @surface has been set as surface or not.
- *
- * Since: 1.18
- * Stability: unstable
- */
-CoglBool
-cogl_mir_onscreen_set_foreign_surface (CoglOnscreen *onscreen,
-                                       struct MirSurface *surface);
-
-/**
- * cogl_mir_onscreen_resize:
- * @onscreen: A #CoglOnscreen framebuffer
- * @width: The desired width of the framebuffer
- * @height: The desired height of the framebuffer
- *
- * Resizes the backbuffer of the given @onscreen framebuffer to the
- * given size.
- *
- * Note that if some drawing commands have been applied to the
- * framebuffer since the last swap buffers then the resize will be
- * queued and will only take effect in the next swap buffers.
- *
- * Since: 1.18
- * Stability: unstable
- */
-void
-cogl_mir_onscreen_resize (CoglOnscreen *onscreen,
-                          int           width,
-                          int           height);
-#endif /* COGL_HAS_EGL_PLATFORM_MIR_SUPPORT */
-
 /**
  * cogl_onscreen_set_swap_throttled:
  * @onscreen: A #CoglOnscreen framebuffer
diff --git a/cogl/cogl-renderer-private.h b/cogl/cogl-renderer-private.h
index c10c3fb..8e8e336 100644
--- a/cogl/cogl-renderer-private.h
+++ b/cogl/cogl-renderer-private.h
@@ -48,9 +48,6 @@
 #include <wayland-client.h>
 #endif
 
-#if defined (COGL_HAS_EGL_PLATFORM_MIR_SUPPORT)
-#include <mir_toolkit/mir_client_library.h>
-#endif
 
 struct _CoglRenderer
 {
@@ -88,10 +85,6 @@ struct _CoglRenderer
   CoglBool wayland_enable_event_dispatch;
 #endif
 
-#if defined (COGL_HAS_EGL_PLATFORM_MIR_SUPPORT)
-  MirConnection *foreign_mir_connection;
-#endif
-
 #if defined (COGL_HAS_EGL_PLATFORM_KMS_SUPPORT)
   int kms_fd;
 #endif
diff --git a/cogl/cogl-renderer.c b/cogl/cogl-renderer.c
index 20dcc0b..0f0390d 100644
--- a/cogl/cogl-renderer.c
+++ b/cogl/cogl-renderer.c
@@ -63,9 +63,6 @@
 #ifdef COGL_HAS_EGL_PLATFORM_ANDROID_SUPPORT
 #include "cogl-winsys-egl-android-private.h"
 #endif
-#ifdef COGL_HAS_EGL_PLATFORM_MIR_SUPPORT
-#include "cogl-winsys-egl-mir-private.h"
-#endif
 #ifdef COGL_HAS_GLX_SUPPORT
 #include "cogl-winsys-glx-private.h"
 #endif
@@ -186,9 +183,6 @@ static CoglWinsysVtableGetter _cogl_winsys_vtable_getters[] =
 #ifdef COGL_HAS_EGL_PLATFORM_ANDROID_SUPPORT
   _cogl_winsys_egl_android_get_vtable,
 #endif
-#ifdef COGL_HAS_EGL_PLATFORM_MIR_SUPPORT
-  _cogl_winsys_egl_mir_get_vtable,
-#endif
   _cogl_winsys_stub_get_vtable,
 };
 
diff --git a/cogl/cogl-renderer.h b/cogl/cogl-renderer.h
index e5aaaf9..dd9e9fd 100644
--- a/cogl/cogl-renderer.h
+++ b/cogl/cogl-renderer.h
@@ -165,7 +165,6 @@ cogl_renderer_new (void);
  * @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
- * @COGL_WINSYS_ID_EGL_MIR: Use EGL with the Mir server
  *
  * Identifies specific window system backends that Cogl supports.
  *
@@ -182,7 +181,6 @@ typedef enum
   COGL_WINSYS_ID_EGL_WAYLAND,
   COGL_WINSYS_ID_EGL_KMS,
   COGL_WINSYS_ID_EGL_ANDROID,
-  COGL_WINSYS_ID_EGL_MIR,
 } CoglWinsysID;
 
 /**
diff --git a/cogl/cogl.h b/cogl/cogl.h
index baec66d..7fa3921 100644
--- a/cogl/cogl.h
+++ b/cogl/cogl.h
@@ -138,9 +138,6 @@
 #include <cogl/cogl-kms-renderer.h>
 #include <cogl/cogl-kms-display.h>
 #endif
-#if defined (COGL_HAS_EGL_PLATFORM_MIR_SUPPORT)
-#include <cogl/cogl-mir-renderer.h>
-#endif
 #ifdef COGL_HAS_GLIB_SUPPORT
 #include <cogl/cogl-glib-source.h>
 #endif
diff --git a/configure.ac b/configure.ac
index 541d4b4..a52880a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,7 +111,6 @@ AC_SUBST([GI_REQ_VERSION], [gi_req_version])
 AC_SUBST([UPROF_REQ_VERSION], [uprof_req_version])
 AC_SUBST([WAYLAND_REQ_VERSION], [wayland_req_version])
 AC_SUBST([WAYLAND_SERVER_REQ_VERSION], [wayland_server_req_version])
-AC_SUBST([MIRCLIENT_REQ_VERSION], [mirclient_req_version])
 
 # Save this value here, since automake will set cflags later and we
 # want to know if the user specified custom cflags or not.
@@ -886,28 +885,6 @@ AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_ANDROID,
                [test "x$enable_android_egl_platform" = "xyes"])
 
 
-dnl Mir EGL platform
-AC_ARG_ENABLE(
-  [mir-egl-platform],
-  [AC_HELP_STRING([--enable-mir-egl-platform=@<:@no/yes@:>@], [Enable support for the Mir egl platform 
@<:@default=no@:>@])],
-  [],
-  enable_mir_egl_platform=no
-)
-AS_IF([test "x$enable_mir_egl_platform" = "xyes"],
-      [
-        EGL_PLATFORM_COUNT=$((EGL_PLATFORM_COUNT+1))
-        NEED_EGL=yes
-        EGL_PLATFORMS="$EGL_PLATFORMS mir"
-
-        PKG_CHECK_MODULES(MIR_CLIENT,
-                          [mirclient >= mirclient_req_version])
-        COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES mirclient >= mirclient_req_version"
-
-        COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_PLATFORM_MIR_SUPPORT"
-      ])
-AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_MIR,
-               [test "x$enable_mir_egl_platform" = "xyes"])
-
 dnl This should go last, since it's the default fallback and we need
 dnl to check the value of $EGL_PLATFORM_COUNT here.
 AC_ARG_ENABLE(