diff --git a/cogl/cogl/cogl-x11-renderer-private.h b/cogl/cogl/cogl-x11-renderer-private.h deleted file mode 100644 index 5a0559580..000000000 --- a/cogl/cogl/cogl-x11-renderer-private.h +++ /dev/null @@ -1,37 +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. - * - * - */ - -#pragma once - -typedef struct _CoglX11Renderer -{ - int damage_base; - int randr_base; -} CoglX11Renderer; diff --git a/cogl/cogl/cogl-xlib-renderer-private.h b/cogl/cogl/cogl-xlib-renderer-private.h index b6c5a5315..bc79b558e 100644 --- a/cogl/cogl/cogl-xlib-renderer-private.h +++ b/cogl/cogl/cogl-xlib-renderer-private.h @@ -33,7 +33,6 @@ #include #include -#include "cogl/cogl-x11-renderer-private.h" #include "cogl/cogl-context.h" typedef struct _CoglXlibOutput @@ -49,6 +48,12 @@ typedef struct _CoglXlibOutput SubpixelOrder subpixel_order; } CoglXlibOutput; +typedef struct _CoglX11Renderer +{ + int damage_base; + int randr_base; +} CoglX11Renderer; + typedef struct _CoglXlibRenderer { CoglX11Renderer _parent; diff --git a/cogl/cogl/cogl-xlib-renderer.c b/cogl/cogl/cogl-xlib-renderer.c index 3e757ebf9..d35178055 100644 --- a/cogl/cogl/cogl-xlib-renderer.c +++ b/cogl/cogl/cogl-xlib-renderer.c @@ -36,7 +36,6 @@ #include "cogl/cogl-renderer-private.h" #include "cogl/cogl-xlib-renderer-private.h" -#include "cogl/cogl-x11-renderer-private.h" #include "cogl/winsys/cogl-winsys-private.h" #include "mtk/mtk-x11.h" diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build index e52a7fb8b..9957d361a 100644 --- a/cogl/cogl/meson.build +++ b/cogl/cogl/meson.build @@ -292,7 +292,6 @@ if have_x11 cogl_sources += [ 'cogl-x11-onscreen.c', 'cogl-x11-onscreen.h', - 'cogl-x11-renderer-private.h', 'cogl-xlib-renderer-private.h', 'cogl-xlib-renderer.c', 'winsys/cogl-texture-pixmap-x11-private.h', diff --git a/cogl/cogl/winsys/cogl-texture-pixmap-x11.c b/cogl/cogl/winsys/cogl-texture-pixmap-x11.c index e2234f757..edb355462 100644 --- a/cogl/cogl/winsys/cogl-texture-pixmap-x11.c +++ b/cogl/cogl/winsys/cogl-texture-pixmap-x11.c @@ -49,7 +49,6 @@ #include "cogl/cogl-renderer-private.h" #include "cogl/cogl-xlib-renderer.h" #include "cogl/cogl-xlib-renderer-private.h" -#include "cogl/cogl-x11-renderer-private.h" #include "cogl/cogl-private.h" #include "cogl/driver/gl/cogl-texture-gl-private.h" #include "cogl/winsys/cogl-winsys-private.h"