isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-27 05:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

cogl: Unify HAS_X11/HAS_XLIB build configs

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2354>
This commit is contained in:
Bilal Elmoussaoui 2022-05-03 12:53:45 +02:00
parent 9ba510646c
commit bd94adaf74
7 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogl/cogl/cogl-defines.h.meson
View File

@ -42,8 +42,6 @@
#mesondefine COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT #mesondefine COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT
#mesondefine COGL_HAS_EGL_SUPPORT #mesondefine COGL_HAS_EGL_SUPPORT
#mesondefine COGL_HAS_X11 #mesondefine COGL_HAS_X11
#mesondefine COGL_HAS_X11_SUPPORT
#mesondefine COGL_HAS_XLIB #mesondefine COGL_HAS_XLIB
#mesondefine COGL_HAS_XLIB_SUPPORT
#mesondefine COGL_HAS_TRACING #mesondefine COGL_HAS_TRACING

2
cogl/cogl/cogl-mutter.h
View File

@ -45,7 +45,7 @@
#if defined (COGL_HAS_GLX_SUPPORT) #if defined (COGL_HAS_GLX_SUPPORT)
#include <cogl/winsys/cogl-onscreen-glx.h> #include <cogl/winsys/cogl-onscreen-glx.h>
#endif #endif
#if defined (COGL_HAS_XLIB_SUPPORT) #if defined (COGL_HAS_XLIB)
#include <cogl/winsys/cogl-onscreen-xlib.h> #include <cogl/winsys/cogl-onscreen-xlib.h>
#endif #endif
#ifdef COGL_HAS_X11 #ifdef COGL_HAS_X11

2
cogl/cogl/cogl-renderer-private.h
View File

@ -63,7 +63,7 @@ struct _CoglRenderer
GList *outputs; GList *outputs;
#ifdef COGL_HAS_XLIB_SUPPORT #ifdef COGL_HAS_XLIB
Display *foreign_xdpy; Display *foreign_xdpy;
gboolean xlib_enable_event_retrieval; gboolean xlib_enable_event_retrieval;
gboolean xlib_want_reset_on_video_memory_purge; gboolean xlib_want_reset_on_video_memory_purge;

8
cogl/cogl/cogl-renderer.c
View File

@ -55,7 +55,7 @@
#include "winsys/cogl-winsys-glx-private.h" #include "winsys/cogl-winsys-glx-private.h"
#endif #endif
#ifdef COGL_HAS_XLIB_SUPPORT #ifdef COGL_HAS_XLIB
#include "cogl-xlib-renderer.h" #include "cogl-xlib-renderer.h"
#endif #endif
@ -202,14 +202,14 @@ cogl_renderer_new (void)
_cogl_list_init (&renderer->idle_closures); _cogl_list_init (&renderer->idle_closures);
#ifdef COGL_HAS_XLIB_SUPPORT #ifdef COGL_HAS_XLIB
renderer->xlib_enable_event_retrieval = TRUE; renderer->xlib_enable_event_retrieval = TRUE;
#endif #endif
return _cogl_renderer_object_new (renderer); return _cogl_renderer_object_new (renderer);
} }
#ifdef COGL_HAS_XLIB_SUPPORT #ifdef COGL_HAS_XLIB
void void
cogl_xlib_renderer_set_foreign_display (CoglRenderer *renderer, cogl_xlib_renderer_set_foreign_display (CoglRenderer *renderer,
Display *xdisplay) Display *xdisplay)
@ -243,7 +243,7 @@ cogl_xlib_renderer_request_reset_on_video_memory_purge (CoglRenderer *renderer,
renderer->xlib_want_reset_on_video_memory_purge = enable; renderer->xlib_want_reset_on_video_memory_purge = enable;
} }
#endif /* COGL_HAS_XLIB_SUPPORT */ #endif /* COGL_HAS_XLIB */
gboolean gboolean
cogl_renderer_check_onscreen_template (CoglRenderer *renderer, cogl_renderer_check_onscreen_template (CoglRenderer *renderer,

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

@ -40,7 +40,7 @@
#include "cogl-context-private.h" #include "cogl-context-private.h"
#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
#include "cogl-xlib-renderer.h" #include "cogl-xlib-renderer.h"
#endif #endif
#include "winsys/cogl-winsys-private.h" #include "winsys/cogl-winsys-private.h"

2
cogl/cogl/meson.build
View File

@ -8,9 +8,7 @@ cdata.set('COGL_HAS_GLX_SUPPORT', have_glx)
cdata.set('COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT', have_egl_xlib) cdata.set('COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT', have_egl_xlib)
cdata.set('COGL_HAS_EGL_SUPPORT', have_egl) cdata.set('COGL_HAS_EGL_SUPPORT', have_egl)
cdata.set('COGL_HAS_X11', have_x11) cdata.set('COGL_HAS_X11', have_x11)
cdata.set('COGL_HAS_X11_SUPPORT', have_x11)
cdata.set('COGL_HAS_XLIB', have_x11_client) cdata.set('COGL_HAS_XLIB', have_x11_client)
cdata.set('COGL_HAS_XLIB_SUPPORT', have_x11_client)
cdata.set('COGL_HAS_TRACING', have_profiler) cdata.set('COGL_HAS_TRACING', have_profiler)
cogl_defines_h = configure_file( cogl_defines_h = configure_file(

6
cogl/cogl/winsys/cogl-winsys-private.h
View File

@ -34,11 +34,11 @@
#include "cogl-renderer.h" #include "cogl-renderer.h"
#include "cogl-scanout.h" #include "cogl-scanout.h"
#ifdef COGL_HAS_XLIB_SUPPORT #ifdef COGL_HAS_XLIB
#include "cogl-texture-pixmap-x11-private.h" #include "cogl-texture-pixmap-x11-private.h"
#endif #endif
#ifdef COGL_HAS_XLIB_SUPPORT #ifdef COGL_HAS_XLIB
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include "cogl-texture-pixmap-x11-private.h" #include "cogl-texture-pixmap-x11-private.h"
#endif #endif
@ -114,7 +114,7 @@ typedef struct _CoglWinsysVtable
/* Optional functions */ /* Optional functions */
#ifdef COGL_HAS_XLIB_SUPPORT #ifdef COGL_HAS_XLIB
gboolean gboolean
(*texture_pixmap_x11_create) (CoglTexturePixmapX11 *tex_pixmap); (*texture_pixmap_x11_create) (CoglTexturePixmapX11 *tex_pixmap);
void void