[mutter/gbsneto/drop-cogl-wayland-server: 1/2] cogl: Drop cogl-wayland-server.h
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/gbsneto/drop-cogl-wayland-server: 1/2] cogl: Drop cogl-wayland-server.h
- Date: Tue, 7 Dec 2021 21:44:29 +0000 (UTC)
commit 87a66830dc0ab74a2709b82e1fe31d231676b74d
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Tue Dec 7 18:34:00 2021 -0300
cogl: Drop cogl-wayland-server.h
This header only defines one function that doesn't exist anymore,
and nothing else. It can be safely dropped.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2145>
cogl/cogl/cogl-texture-2d.c | 4 --
cogl/cogl/cogl-wayland-server.h | 88 -----------------------------
cogl/cogl/meson.build | 6 --
src/compositor/meta-surface-actor-wayland.c | 1 -
src/wayland/meta-wayland-cursor-surface.c | 1 -
src/wayland/meta-wayland-pointer.c | 1 -
src/wayland/meta-wayland-surface.c | 1 -
7 files changed, 102 deletions(-)
---
diff --git a/cogl/cogl/cogl-texture-2d.c b/cogl/cogl/cogl-texture-2d.c
index bababf749c..07ab820740 100644
--- a/cogl/cogl/cogl-texture-2d.c
+++ b/cogl/cogl/cogl-texture-2d.c
@@ -51,10 +51,6 @@
#include <string.h>
#include <math.h>
-#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
-#include "cogl-wayland-server.h"
-#endif
-
static void _cogl_texture_2d_free (CoglTexture2D *tex_2d);
COGL_TEXTURE_DEFINE (Texture2D, texture_2d);
diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index b34e2216cb..f73d29f877 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -396,12 +396,6 @@ if have_glx
]
endif
-if have_wayland
- cogl_nonintrospected_headers += [
- 'cogl-wayland-server.h',
- ]
-endif
-
if have_egl
cogl_nonintrospected_headers += [
'cogl-egl.h',
diff --git a/src/compositor/meta-surface-actor-wayland.c b/src/compositor/meta-surface-actor-wayland.c
index 8c2a93da1e..3fce4b3da6 100644
--- a/src/compositor/meta-surface-actor-wayland.c
+++ b/src/compositor/meta-surface-actor-wayland.c
@@ -30,7 +30,6 @@
#include "backends/meta-backend-private.h"
#include "backends/meta-logical-monitor.h"
-#include "cogl/cogl-wayland-server.h"
#include "compositor/meta-shaped-texture-private.h"
#include "compositor/region-utils.h"
#include "wayland/meta-wayland-buffer.h"
diff --git a/src/wayland/meta-wayland-cursor-surface.c b/src/wayland/meta-wayland-cursor-surface.c
index f4b2888125..a0b8757021 100644
--- a/src/wayland/meta-wayland-cursor-surface.c
+++ b/src/wayland/meta-wayland-cursor-surface.c
@@ -25,7 +25,6 @@
#include "backends/meta-backend-private.h"
#include "backends/meta-logical-monitor.h"
-#include "cogl/cogl-wayland-server.h"
#include "cogl/cogl.h"
#include "core/boxes-private.h"
#include "wayland/meta-cursor-sprite-wayland.h"
diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c
index 62708f162f..ef76acb5db 100644
--- a/src/wayland/meta-wayland-pointer.c
+++ b/src/wayland/meta-wayland-pointer.c
@@ -51,7 +51,6 @@
#include "backends/meta-cursor-tracker-private.h"
#include "backends/meta-cursor.h"
#include "clutter/clutter.h"
-#include "cogl/cogl-wayland-server.h"
#include "cogl/cogl.h"
#include "compositor/meta-surface-actor-wayland.h"
#include "meta/meta-cursor-tracker.h"
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index 630c76c8aa..ffe030b2c7 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -29,7 +29,6 @@
#include "backends/meta-cursor-tracker-private.h"
#include "clutter/clutter.h"
-#include "cogl/cogl-wayland-server.h"
#include "cogl/cogl.h"
#include "compositor/meta-surface-actor-wayland.h"
#include "compositor/meta-surface-actor.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]