GNOME.org
 

[cogl/rstrode/wip/prepare-for-mutter-merge: 9/12] renderer: drop wayland client support

commit 28f22e5042f99b0dc4aa21b0509198385583b5f9
Author: Ray Strode <rstrode redhat com>
Date:   Tue Jan 12 16:57:53 2016 -0500

    renderer: drop wayland client support

 cogl/Makefile.am             |    8 -----
 cogl/cogl-onscreen-private.h |    4 --
 cogl/cogl-onscreen.h         |   67 ------------------------------------------
 cogl/cogl-renderer-private.h |   10 ------
 cogl/cogl-renderer.c         |   10 ------
 cogl/cogl-renderer.h         |    2 -
 cogl/cogl.symbols            |   11 -------
 configure.ac                 |   23 --------------
 8 files changed, 0 insertions(+), 135 deletions(-)
---
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index c1cc10a..f3a8f86 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -452,14 +452,6 @@ endif
 if SUPPORT_WAYLAND_EGL_SERVER
 cogl_experimental_h += cogl-wayland-server.h
 endif
-if SUPPORT_EGL_PLATFORM_WAYLAND
-cogl_experimental_h += \
-       cogl-wayland-renderer.h \
-       cogl-wayland-client.h
-cogl_sources_c += \
-       winsys/cogl-winsys-egl-wayland.c \
-       winsys/cogl-winsys-egl-wayland-private.h
-endif
 if SUPPORT_EGL_PLATFORM_KMS
 cogl_experimental_h += \
        cogl-kms-renderer.h \
diff --git a/cogl/cogl-onscreen-private.h b/cogl/cogl-onscreen-private.h
index f982d20..0a67832 100644
--- a/cogl/cogl-onscreen-private.h
+++ b/cogl/cogl-onscreen-private.h
@@ -65,10 +65,6 @@ struct _CoglOnscreen
   void *foreign_update_mask_data;
 #endif
 
-#ifdef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT
-  struct wl_surface *foreign_surface;
-#endif
-
   CoglBool swap_throttled;
 
   CoglList frame_closures;
diff --git a/cogl/cogl-onscreen.h b/cogl/cogl-onscreen.h
index 7f9fa16..6a55c4c 100644
--- a/cogl/cogl-onscreen.h
+++ b/cogl/cogl-onscreen.h
@@ -166,73 +166,6 @@ uint32_t
 cogl_x11_onscreen_get_visual_xid (CoglOnscreen *onscreen);
 #endif /* COGL_HAS_X11 */
 
-#if defined (COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT)
-struct wl_surface *
-cogl_wayland_onscreen_get_surface (CoglOnscreen *onscreen);
-struct wl_shell_surface *
-cogl_wayland_onscreen_get_shell_surface (CoglOnscreen *onscreen);
-
-/**
- * cogl_wayland_onscreen_set_foreign_surface:
- * @onscreen: An unallocated framebuffer.
- * @surface A Wayland surface to associate with the @onscreen.
- *
- * Allows you to explicitly notify Cogl of an existing Wayland surface to use,
- * which prevents Cogl from allocating a surface and shell 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.
- *
- * Since: 1.16
- * Stability: unstable
- */
-void
-cogl_wayland_onscreen_set_foreign_surface (CoglOnscreen *onscreen,
-                                           struct wl_surface *surface);
-
-/**
- * cogl_wayland_onscreen_resize:
- * @onscreen: A #CoglOnscreen framebuffer
- * @width: The desired width of the framebuffer
- * @height: The desired height of the framebuffer
- * @offset_x: A relative x offset for the new framebuffer
- * @offset_y: A relative y offset for the new framebuffer
- *
- * Resizes the backbuffer of the given @onscreen framebuffer to the
- * given size. Since a buffer is usually conceptually scaled with a
- * center point the @offset_x and @offset_y arguments allow the newly
- * allocated buffer to be positioned relative to the old buffer size.
- *
- * For example a buffer that is being resized by moving the bottom right
- * corner, and the top left corner is remaining static would use x and y
- * offsets of (0, 0) since the top-left of the new buffer should have the same
- * position as the old buffer. If the center of the old buffer is being zoomed
- * into then all the corners of the new buffer move out from the center and the x
- * and y offsets would be (-half_x_size_increase, -half_y_size_increase) where
- * x/y_size_increase is how many pixels bigger the buffer is on the x and y
- * axis.
- *
- * 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.
- *
- * If multiple calls to cogl_wayland_onscreen_resize() get queued
- * before the next swap buffers request then the relative x and y
- * offsets accumulate instead of being replaced. The @width and
- * @height values superseed the old values.
- *
- * Since: 1.10
- * Stability: unstable
- */
-void
-cogl_wayland_onscreen_resize (CoglOnscreen *onscreen,
-                              int           width,
-                              int           height,
-                              int           offset_x,
-                              int           offset_y);
-#endif /* COGL_HAS_EGL_PLATFORM_WAYLAND_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 8e8e336..f226968 100644
--- a/cogl/cogl-renderer-private.h
+++ b/cogl/cogl-renderer-private.h
@@ -44,11 +44,6 @@
 #include <X11/Xlib.h>
 #endif
 
-#if defined (COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT)
-#include <wayland-client.h>
-#endif
-
-
 struct _CoglRenderer
 {
   CoglObject _parent;
@@ -80,11 +75,6 @@ struct _CoglRenderer
   GModule *libgl_module;
 #endif
 
-#if defined (COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT)
-  struct wl_display *foreign_wayland_display;
-  CoglBool wayland_enable_event_dispatch;
-#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 5bb1eaf..1d3eba5 100644
--- a/cogl/cogl-renderer.c
+++ b/cogl/cogl-renderer.c
@@ -54,9 +54,6 @@
 #ifdef COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT
 #include "cogl-winsys-egl-x11-private.h"
 #endif
-#ifdef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT
-#include "cogl-winsys-egl-wayland-private.h"
-#endif
 #ifdef COGL_HAS_EGL_PLATFORM_KMS_SUPPORT
 #include "cogl-winsys-egl-kms-private.h"
 #endif
@@ -171,9 +168,6 @@ static CoglWinsysVtableGetter _cogl_winsys_vtable_getters[] =
 #ifdef COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT
   _cogl_winsys_egl_xlib_get_vtable,
 #endif
-#ifdef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT
-  _cogl_winsys_egl_wayland_get_vtable,
-#endif
 #ifdef COGL_HAS_EGL_PLATFORM_KMS_SUPPORT
   _cogl_winsys_egl_kms_get_vtable,
 #endif
@@ -252,10 +246,6 @@ cogl_renderer_new (void)
   renderer->xlib_enable_event_retrieval = TRUE;
 #endif
 
-#ifdef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT
-  renderer->wayland_enable_event_dispatch = TRUE;
-#endif
-
 #ifdef COGL_HAS_EGL_PLATFORM_KMS_SUPPORT
   renderer->kms_fd = -1;
 #endif
diff --git a/cogl/cogl-renderer.h b/cogl/cogl-renderer.h
index 268a1a0..abc580d 100644
--- a/cogl/cogl-renderer.h
+++ b/cogl/cogl-renderer.h
@@ -162,7 +162,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_WAYLAND: Use EGL with the Wayland window system
  * @COGL_WINSYS_ID_EGL_KMS: Use EGL with the KMS platform
  *
  * Identifies specific window system backends that Cogl supports.
@@ -177,7 +176,6 @@ typedef enum
   COGL_WINSYS_ID_GLX,
   COGL_WINSYS_ID_EGL_XLIB,
   COGL_WINSYS_ID_EGL_NULL,
-  COGL_WINSYS_ID_EGL_WAYLAND,
   COGL_WINSYS_ID_EGL_KMS,
 } CoglWinsysID;
 
diff --git a/cogl/cogl.symbols b/cogl/cogl.symbols
index 1926dee..ad42407 100644
--- a/cogl/cogl.symbols
+++ b/cogl/cogl.symbols
@@ -1023,18 +1023,7 @@ cogl_winsys_feature_get_type
 
 #ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
 cogl_wayland_display_set_compositor_display
-#endif
-#ifdef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT
-cogl_wayland_onscreen_get_shell_surface
-cogl_wayland_onscreen_get_surface
-#endif
-#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
 cogl_wayland_onscreen_resize
-#endif
-#ifdef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT
-cogl_wayland_onscreen_set_foreign_surface
-#endif
-#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
 cogl_wayland_renderer_get_display
 cogl_wayland_renderer_set_event_dispatch_enabled
 cogl_wayland_renderer_set_foreign_display
diff --git a/configure.ac b/configure.ac
index eecf4b4..44fced5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -788,29 +788,6 @@ AM_CONDITIONAL(SUPPORT_GLX, [test "x$SUPPORT_GLX" = "xyes"])
 EGL_PLATFORM_COUNT=0
 
 AC_ARG_ENABLE(
-  [wayland-egl-platform],
-  [AC_HELP_STRING([--enable-wayland-egl-platform=@<:@no/yes@:>@], [Enable support for the Wayland egl 
platform @<:@default=no@:>@])],
-  [],
-  enable_wayland_egl_platform=no
-)
-AS_IF([test "x$enable_wayland_egl_platform" = "xyes"],
-      [
-        EGL_PLATFORM_COUNT=$((EGL_PLATFORM_COUNT+1))
-        NEED_EGL=yes
-        EGL_PLATFORMS="$EGL_PLATFORMS wayland"
-
-        PKG_CHECK_MODULES(WAYLAND_CLIENT,
-                          [wayland-egl >= wayland_req_version wayland-client >= wayland_req_version])
-        COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES wayland-egl >= wayland_req_version"
-        COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES wayland-client >= wayland_req_version"
-
-        COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT"
-      ])
-AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_WAYLAND,
-               [test "x$enable_wayland_egl_platform" = "xyes"])
-
-
-AC_ARG_ENABLE(
   [kms-egl-platform],
   [AC_HELP_STRING([--enable-kms-egl-platform=@<:@no/yes@:>@], [Enable support for the KMS egl platform 
@<:@default=no@:>@])],
   [],
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]