clutter: Remove Wayland server helper

It's a wrapper around a similar Cogl API we don't use anymore.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1863>

clutter/clutter/clutter-backend.c

@@ -50,18 +50,8 @@
 #include "clutter-stage-private.h"
 #include "clutter-stage-window.h"
 
-#ifdef CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT
-#include "wayland/clutter-wayland-compositor.h"
-#endif
-
 #include <cogl/cogl.h>
 
-#ifdef CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT
-#include <cogl/cogl-wayland-server.h>
-#include <wayland-server.h>
-#include "wayland/clutter-wayland-compositor.h"
-#endif
-
 #define DEFAULT_FONT_NAME       "Sans 10"
 
 enum
@@ -77,12 +67,6 @@ G_DEFINE_ABSTRACT_TYPE (ClutterBackend, clutter_backend, G_TYPE_OBJECT)
 
 static guint backend_signals[LAST_SIGNAL] = { 0, };
 
-/* Global for being able to specify a compositor side wayland display
- * pointer before clutter initialization */
-#ifdef CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT
-static struct wl_display *_wayland_compositor_display;
-#endif
-
 static void
 clutter_backend_dispose (GObject *gobject)
 {
@@ -262,11 +246,6 @@ clutter_backend_do_real_create_context (ClutterBackend  *backend,
   if (backend->cogl_display == NULL)
     goto error;
 
-#ifdef CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT
-  cogl_wayland_display_set_compositor_display (backend->cogl_display,
-                                               _wayland_compositor_display);
-#endif
-
   CLUTTER_NOTE (BACKEND, "Setting up the display");
   if (!cogl_display_setup (backend->cogl_display, &internal_error))
     goto error;
@@ -818,31 +797,6 @@ clutter_backend_get_cogl_context (ClutterBackend *backend)
   return backend->cogl_context;
 }
 
-#ifdef CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT
-/**
- * clutter_wayland_set_compositor_display:
- * @display: A compositor side struct wl_display pointer
- *
- * This informs Clutter of your compositor side Wayland display
- * object. This must be called before calling clutter_init().
- *
- * Since: 1.8
- * Stability: unstable
- */
-void
-clutter_wayland_set_compositor_display (void *display)
-{
-  if (_clutter_context_is_initialized ())
-    {
-      g_warning ("%s() can only be used before calling clutter_init()",
-                 G_STRFUNC);
-      return;
-    }
-
-  _wayland_compositor_display = display;
-}
-#endif
-
 void
 clutter_set_allowed_drivers (const char *drivers)
 {

clutter/clutter/clutter-config.h.in

@@ -9,7 +9,6 @@
 
 G_BEGIN_DECLS
 
-#mesondefine CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT
 #mesondefine CLUTTER_WINDOWING_X11
 #mesondefine CLUTTER_INPUT_X11
 #mesondefine CLUTTER_WINDOWING_GLX

clutter/clutter/meson.build

@@ -264,13 +264,6 @@ if have_x11
   clutter_backend_nonintrospected_sources += clutter_x11_nonintrospected_sources
 endif
 
-if have_wayland
-  clutter_wayland_private_headers = [
-    'wayland/clutter-wayland-compositor.h',
-  ]
-  clutter_backend_private_headers += clutter_wayland_private_headers
-endif
-
 cally_headers = [
     'cally/cally-actor.h',
     'cally/cally-clone.h',
@@ -317,9 +310,6 @@ clutter_build_config_h = configure_file(
 clutter_built_private_headers += clutter_build_config_h
 
 cdata = configuration_data()
-if have_wayland
-  cdata.set10('CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT', true)
-endif
 if have_x11
   cdata.set_quoted('CLUTTER_WINDOWING_X11', 'x11')
   cdata.set_quoted('CLUTTER_INPUT_X11', 'x11')

clutter/clutter/wayland/clutter-wayland-compositor.h

@@ -1,45 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Copyright (C) 2011 Intel Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *   Robert Bragg <robert@linux.intel.com>
- */
-
-/**
- * SECTION:clutter-wayland-compositor
- * @short_description: Wayland compositor specific APIs
- *
- * Clutter provides some Wayland specific APIs to aid in writing
- * Clutter based compositors.
- *
- * The Clutter Wayland compositor API is available since Clutter 1.8
- */
-
-#ifndef __CLUTTER_WAYLAND_COMPOSITOR_H__
-#define __CLUTTER_WAYLAND_COMPOSITOR_H__
-
-G_BEGIN_DECLS
-
-CLUTTER_EXPORT
-void    clutter_wayland_set_compositor_display  (void *display);
-
-G_END_DECLS
-
-#endif /* __CLUTTER_WAYLAND_COMPOSITOR_H__ */

src/wayland/meta-wayland-surface.c

@@ -29,7 +29,6 @@
 
 #include "backends/meta-cursor-tracker-private.h"
 #include "clutter/clutter.h"
-#include "clutter/wayland/clutter-wayland-compositor.h"
 #include "cogl/cogl-wayland-server.h"
 #include "cogl/cogl.h"
 #include "compositor/meta-surface-actor-wayland.h"