sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

cogl/xlib-renderer: Move struct where it is used

Browse source 
The extra header is too much for one struct

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3910>
This commit is contained in:
Bilal Elmoussaoui 2024-07-27 09:56:43 +02:00 committed by Marge Bot
parent e57d3615bc
commit 47695daed1
5 changed files with 6 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
cogl/cogl/cogl-x11-renderer-private.h
View file

@ -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;

7
cogl/cogl/cogl-xlib-renderer-private.h
View file

@ -33,7 +33,6 @@
#include <X11/Xutil.h>
#include <X11/extensions/Xrandr.h>
#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;

1
cogl/cogl/cogl-xlib-renderer.c
View file

@ -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"

1
cogl/cogl/meson.build
View file

@ -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',

1
cogl/cogl/winsys/cogl-texture-pixmap-x11.c
View file

@ -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"