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

cogl: Unconditionally depend on cairo

Browse Source
This commit is contained in:
Jonas Ådahl 2018-05-18 16:24:45 +02:00
parent 99fb79f4cb
commit 12171e413b
2 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cogl/cogl/cogl-rectangle-map.c
View File

@ -48,7 +48,7 @@
http://www.blackpawn.com/texts/lightmaps/default.html http://www.blackpawn.com/texts/lightmaps/default.html
*/ */
#if defined (COGL_ENABLE_DEBUG) && defined (HAVE_CAIRO) #ifdef COGL_ENABLE_DEBUG
/* The cairo header is only used for debugging to generate an image of /* The cairo header is only used for debugging to generate an image of
the atlas */ the atlas */
@ -56,7 +56,7 @@
static void _cogl_rectangle_map_dump_image (CoglRectangleMap *map); static void _cogl_rectangle_map_dump_image (CoglRectangleMap *map);
#endif /* COGL_ENABLE_DEBUG && HAVE_CAIRO */ #endif /* COGL_ENABLE_DEBUG */
typedef struct _CoglRectangleMapNode CoglRectangleMapNode; typedef struct _CoglRectangleMapNode CoglRectangleMapNode;
typedef struct _CoglRectangleMapStackEntry CoglRectangleMapStackEntry; typedef struct _CoglRectangleMapStackEntry CoglRectangleMapStackEntry;
@ -464,9 +464,7 @@ _cogl_rectangle_map_add (CoglRectangleMap *map,
#ifdef COGL_ENABLE_DEBUG #ifdef COGL_ENABLE_DEBUG
if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_DUMP_ATLAS_IMAGE))) if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_DUMP_ATLAS_IMAGE)))
{ {
#ifdef HAVE_CAIRO
_cogl_rectangle_map_dump_image (map); _cogl_rectangle_map_dump_image (map);
#endif
/* Dumping the rectangle map is really slow so we might as well /* Dumping the rectangle map is really slow so we might as well
verify the space remaining here as it is also quite slow */ verify the space remaining here as it is also quite slow */
_cogl_rectangle_map_verify (map); _cogl_rectangle_map_verify (map);
@ -557,9 +555,7 @@ _cogl_rectangle_map_remove (CoglRectangleMap *map,
#ifdef COGL_ENABLE_DEBUG #ifdef COGL_ENABLE_DEBUG
if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_DUMP_ATLAS_IMAGE))) if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_DUMP_ATLAS_IMAGE)))
{ {
#ifdef HAVE_CAIRO
_cogl_rectangle_map_dump_image (map); _cogl_rectangle_map_dump_image (map);
#endif
/* Dumping the rectangle map is really slow so we might as well /* Dumping the rectangle map is really slow so we might as well
verify the space remaining here as it is also quite slow */ verify the space remaining here as it is also quite slow */
_cogl_rectangle_map_verify (map); _cogl_rectangle_map_verify (map);
@ -706,7 +702,7 @@ _cogl_rectangle_map_free (CoglRectangleMap *map)
g_free (map); g_free (map);
} }
#if defined (COGL_ENABLE_DEBUG) && defined (HAVE_CAIRO) #ifdef COGL_ENABLE_DEBUG
static void static void
_cogl_rectangle_map_dump_image_cb (CoglRectangleMapNode *node, void *data) _cogl_rectangle_map_dump_image_cb (CoglRectangleMapNode *node, void *data)
@ -761,4 +757,4 @@ _cogl_rectangle_map_dump_image (CoglRectangleMap *map)
cairo_surface_destroy (surface); cairo_surface_destroy (surface);
} }
#endif /* COGL_ENABLE_DEBUG && HAVE_CAIRO */ #endif /* COGL_ENABLE_DEBUG */

20
cogl/configure.ac
View File

@ -148,25 +148,7 @@ dnl Enable cairo usage for debugging
dnl (debugging code can use cairo to dump the atlas) dnl (debugging code can use cairo to dump the atlas)
dnl ============================================================ dnl ============================================================
PKG_CHECK_EXISTS([CAIRO], [cairo >= cairo_req_version], [have_cairo=yes]) COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES cairo >= cairo_req_version"
AC_ARG_ENABLE(
[cairo],
[AC_HELP_STRING([--enable-cairo=@<:@no/yes@:>@], [Control Cairo usage in Cogl debugging code @<:@default=auto@:>@])],
[],
[
AS_IF([test "x$enable_debug" = "xyes"],
[enable_cairo=$have_cairo],
[enable_cairo=no])
]
)
AS_IF([test "x$enable_cairo" = "xyes" && test "x$enable_debug" = "xyes"],
[
AS_IF([test "x$have_cairo" != "xyes"],
[AC_MSG_ERROR([Could not find Cairo])])
COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES cairo >= cairo_req_version"
AC_DEFINE([HAVE_CAIRO], [1], [Whether we have cairo or not])
])
dnl ============================================================ dnl ============================================================