diff --git a/cogl/cogl/cogl-xlib.h b/cogl/cogl/cogl-xlib.h index 7136a943b..4fd803b88 100644 --- a/cogl/cogl/cogl-xlib.h +++ b/cogl/cogl/cogl-xlib.h @@ -55,7 +55,6 @@ #endif /* COGL_COMPILATION */ #include -#include #include #include diff --git a/cogl/cogl/deprecated/cogl-clutter-xlib.h b/cogl/cogl/deprecated/cogl-clutter-xlib.h deleted file mode 100644 index c45b4fa26..000000000 --- a/cogl/cogl/deprecated/cogl-clutter-xlib.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Cogl - * - * A Low Level GPU Graphics and Utilities API - * - * Copyright (C) 2011 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. - */ - -#if !defined(__COGL_XLIB_H_INSIDE__) && !defined(COGL_COMPILATION) -#error "Only can be included directly." -#endif - -#ifndef __COGL_CLUTTER_XLIB_H__ -#define __COGL_CLUTTER_XLIB_H__ - -#include - -G_BEGIN_DECLS - -#define cogl_clutter_winsys_xlib_get_visual_info cogl_clutter_winsys_xlib_get_visual_info_CLUTTER - -/** - * cogl_clutter_winsys_xlib_get_visual_info_CLUTTER: (skip) - */ -XVisualInfo * -cogl_clutter_winsys_xlib_get_visual_info (void); - -G_END_DECLS - -#endif /* __COGL_CLUTTER_XLIB_H__ */ diff --git a/cogl/cogl/deprecated/cogl-clutter.c b/cogl/cogl/deprecated/cogl-clutter.c index 21c7affdc..3c0e63390 100644 --- a/cogl/cogl/deprecated/cogl-clutter.c +++ b/cogl/cogl/deprecated/cogl-clutter.c @@ -41,7 +41,6 @@ #include "cogl-framebuffer-private.h" #include "cogl-onscreen-private.h" #ifdef COGL_HAS_XLIB_SUPPORT -#include "cogl-clutter-xlib.h" #include "cogl-xlib-renderer.h" #endif #include "winsys/cogl-winsys-private.h" @@ -93,20 +92,3 @@ cogl_onscreen_clutter_backend_set_size (int width, int height) _cogl_framebuffer_winsys_update_size (framebuffer, width, height); } - -#ifdef COGL_HAS_XLIB_SUPPORT -XVisualInfo * -cogl_clutter_winsys_xlib_get_visual_info (void) -{ - CoglRenderer *renderer; - - _COGL_GET_CONTEXT (ctx, NULL); - - g_return_val_if_fail (ctx->display != NULL, NULL); - - renderer = cogl_display_get_renderer (ctx->display); - g_return_val_if_fail (renderer != NULL, NULL); - - return cogl_xlib_renderer_get_visual_info (renderer); -} -#endif diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build index e4445c815..c66cfbc7d 100644 --- a/cogl/cogl/meson.build +++ b/cogl/cogl/meson.build @@ -378,9 +378,6 @@ if have_x11 'winsys/cogl-texture-pixmap-x11.h', 'cogl-xlib.h', ] - cogl_deprecated_nonintrospected_headers += [ - 'deprecated/cogl-clutter-xlib.h', - ] cogl_sources += [ 'cogl-x11-renderer-private.h', 'cogl-xlib-private.h',