diff --git a/cogl/cogl/cogl-texture-2d.c b/cogl/cogl/cogl-texture-2d.c index bababf749..07ab82074 100644 --- a/cogl/cogl/cogl-texture-2d.c +++ b/cogl/cogl/cogl-texture-2d.c @@ -51,10 +51,6 @@ #include #include -#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/cogl-wayland-server.h b/cogl/cogl/cogl-wayland-server.h deleted file mode 100644 index f4d83bc24..000000000 --- a/cogl/cogl/cogl-wayland-server.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Cogl - * - * A Low Level GPU Graphics and Utilities API - * - * Copyright (C) 2012 Intel Corporation. - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ - -#ifndef __COGL_WAYLAND_SERVER_H -#define __COGL_WAYLAND_SERVER_H - -#include - -/* NB: this is a top-level header that can be included directly but we - * want to be careful not to define __COGL_H_INSIDE__ when this is - * included internally while building Cogl itself since - * __COGL_H_INSIDE__ is used in headers to guard public vs private api - * definitions - */ -#ifndef COGL_COMPILATION - -/* Note: When building Cogl .gir we explicitly define - * __COGL_H_INSIDE__ */ -#ifndef __COGL_H_INSIDE__ -#define __COGL_H_INSIDE__ -#define __COGL_MUST_UNDEF_COGL_H_INSIDE_COGL_WAYLAND_SERVER_ -#endif - -#endif /* COGL_COMPILATION */ - -#include -#include - -G_BEGIN_DECLS - -/** - * cogl_wayland_display_set_compositor_display: - * @display: a #CoglDisplay - * @wayland_display: A compositor's Wayland display pointer - * - * Informs Cogl of a compositor's Wayland display pointer. This - * enables Cogl to register private wayland extensions required to - * pass buffers between the clients and compositor. - * - * Since: 1.10 - * Stability: unstable - */ -COGL_EXPORT void -cogl_wayland_display_set_compositor_display (CoglDisplay *display, - struct wl_display *wayland_display); - -G_END_DECLS - -/* The gobject introspection scanner seems to parse public headers in - * isolation which means we need to be extra careful about how we - * define and undefine __COGL_H_INSIDE__ used to detect when internal - * headers are incorrectly included by developers. In the gobject - * introspection case we have to manually define __COGL_H_INSIDE__ as - * a commandline argument for the scanner which means we must be - * careful not to undefine it in a header... - */ -#ifdef __COGL_MUST_UNDEF_COGL_H_INSIDE_COGL_WAYLAND_SERVER_ -#undef __COGL_H_INSIDE__ -#undef __COGL_MUST_UNDEF_COGL_H_INSIDE_COGL_WAYLAND_SERVER_ -#endif - -#endif /* __COGL_WAYLAND_SERVER_H */ diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build index b34e2216c..f73d29f87 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 8c2a93da1..3fce4b3da 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 f4b288812..a0b875702 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 62708f162..ef76acb5d 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 630c76c8a..ffe030b2c 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"