isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl: Remove unused cogl_xlib_renderer_get_visual_info

Browse Source 
https://gitlab.gnome.org/GNOME/mutter/merge_requests/885
This commit is contained in:
Adam Jackson 2019-10-24 15:45:30 -04:00
parent b3980f7a94
commit 95662fd3d8
4 changed files with 0 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cogl/cogl/cogl-xlib.h
View File

@ -55,7 +55,6 @@
#endif /* COGL_COMPILATION */ #endif /* COGL_COMPILATION */
#include <cogl/cogl-types.h> #include <cogl/cogl-types.h>
#include <cogl/deprecated/cogl-clutter-xlib.h>
#include <cogl/cogl-xlib-renderer.h> #include <cogl/cogl-xlib-renderer.h>
#include <cogl/cogl-macros.h> #include <cogl/cogl-macros.h>

50
cogl/cogl/deprecated/cogl-clutter-xlib.h
View File

@ -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 <cogl/cogl-xlib.h> can be included directly."
#endif
#ifndef __COGL_CLUTTER_XLIB_H__
#define __COGL_CLUTTER_XLIB_H__
#include <X11/Xutil.h>
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__ */

18
cogl/cogl/deprecated/cogl-clutter.c
View File

@ -41,7 +41,6 @@
#include "cogl-framebuffer-private.h" #include "cogl-framebuffer-private.h"
#include "cogl-onscreen-private.h" #include "cogl-onscreen-private.h"
#ifdef COGL_HAS_XLIB_SUPPORT #ifdef COGL_HAS_XLIB_SUPPORT
#include "cogl-clutter-xlib.h"
#include "cogl-xlib-renderer.h" #include "cogl-xlib-renderer.h"
#endif #endif
#include "winsys/cogl-winsys-private.h" #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); _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

3
cogl/cogl/meson.build
View File

@ -378,9 +378,6 @@ if have_x11
'winsys/cogl-texture-pixmap-x11.h', 'winsys/cogl-texture-pixmap-x11.h',
'cogl-xlib.h', 'cogl-xlib.h',
] ]
cogl_deprecated_nonintrospected_headers += [
'deprecated/cogl-clutter-xlib.h',
]
cogl_sources += [ cogl_sources += [
'cogl-x11-renderer-private.h', 'cogl-x11-renderer-private.h',
'cogl-xlib-private.h', 'cogl-xlib-private.h',