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

[cogl] Add a PANGO debug flag for CoglPango use

Browse Source 
The CoglPango code falls under the COGL "jurisdiction"; this means
that it cannot include Clutter headers unless strictly necessary.

The CoglPangoRenderer code was using the CLUTTER_NOTE() macro. Now
that COGL has it's own COGL_NOTE() similar macro, CoglPango should
use that and avoid including clutter-debug.h (which pulls in
clutter-private.h which in turn pulls in clutter-actor.h).

A new flag, COGL_DEBUG_PANGO, has been added to the COGL debug
flags.
This commit is contained in:
Emmanuele Bassi 2009-02-28 16:03:11 +00:00
parent 3a4538e4f2
commit 8a1eca7287
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clutter/cogl/cogl-debug.h
View File

@ -11,7 +11,8 @@ typedef enum {
COGL_DEBUG_MATERIAL = 1 << 2, COGL_DEBUG_MATERIAL = 1 << 2,
COGL_DEBUG_SHADER = 1 << 3, COGL_DEBUG_SHADER = 1 << 3,
COGL_DEBUG_OFFSCREEN = 1 << 4, COGL_DEBUG_OFFSCREEN = 1 << 4,
COGL_DEBUG_DRAW = 1 << 5 COGL_DEBUG_DRAW = 1 << 5,
COGL_DEBUG_PANGO = 1 << 6
} CoglDebugFlags; } CoglDebugFlags;
#ifdef COGL_ENABLE_DEBUG #ifdef COGL_ENABLE_DEBUG

3
clutter/cogl/common/cogl-debug.c
View File

@ -13,7 +13,8 @@ static const GDebugKey cogl_debug_keys[] = {
{ "material", COGL_DEBUG_MATERIAL }, { "material", COGL_DEBUG_MATERIAL },
{ "shader", COGL_DEBUG_SHADER }, { "shader", COGL_DEBUG_SHADER },
{ "offscreen", COGL_DEBUG_OFFSCREEN }, { "offscreen", COGL_DEBUG_OFFSCREEN },
{ "draw", COGL_DEBUG_DRAW } { "draw", COGL_DEBUG_DRAW },
{ "pango", COGL_DEBUG_PANGO }
}; };
static const gint n_cogl_debug_keys = G_N_ELEMENTS (cogl_debug_keys); static const gint n_cogl_debug_keys = G_N_ELEMENTS (cogl_debug_keys);

5
clutter/pango/cogl-pango-render.c
View File

@ -36,7 +36,6 @@
#include "cogl-pango-private.h" #include "cogl-pango-private.h"
#include "cogl-pango-glyph-cache.h" #include "cogl-pango-glyph-cache.h"
#include "../clutter-debug.h"
struct _CoglPangoRenderer struct _CoglPangoRenderer
{ {
@ -375,10 +374,10 @@ cogl_pango_renderer_get_cached_glyph (PangoRenderer *renderer,
cairo_surface_destroy (surface); cairo_surface_destroy (surface);
CLUTTER_NOTE (PANGO, "cache fail %i", glyph); COGL_NOTE (PANGO, "cache fail %i", glyph);
} }
else else
CLUTTER_NOTE (PANGO, "cache success %i", glyph); COGL_NOTE (PANGO, "cache success %i", glyph);
return value; return value;
} }