From a063f0961129d9e40b3e73ecf30b9976240a09fc Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 13 Oct 2011 11:38:27 +0100 Subject: [PATCH] debug: Move paint-deform-tiles to CLUTTER_PAINT The CLUTTER_DEBUG class of debugging flags is meant for debugging notes, while the CLUTTER_PAINT debugging flags are for changing the output of the paint cycle. Painting the DeformEffect tiles should go in the latter. --- clutter/clutter-debug.h | 6 +++--- clutter/clutter-deform-effect.c | 2 +- clutter/clutter-main.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/clutter/clutter-debug.h b/clutter/clutter-debug.h index be551e1..88b7fce 100644 --- a/clutter/clutter-debug.h +++ b/clutter/clutter-debug.h @@ -27,8 +27,7 @@ typedef enum { CLUTTER_DEBUG_PICK = 1 << 16, CLUTTER_DEBUG_EVENTLOOP = 1 << 17, CLUTTER_DEBUG_CLIPPING = 1 << 18, - CLUTTER_DEBUG_OOB_TRANSFORMS = 1 << 19, - CLUTTER_DEBUG_PAINT_DEFORM_TILES = 1 << 20, + CLUTTER_DEBUG_OOB_TRANSFORMS = 1 << 19 } ClutterDebugFlag; typedef enum { @@ -43,7 +42,8 @@ typedef enum { CLUTTER_DEBUG_PAINT_VOLUMES = 1 << 3, CLUTTER_DEBUG_DISABLE_CULLING = 1 << 4, CLUTTER_DEBUG_DISABLE_OFFSCREEN_REDIRECT = 1 << 5, - CLUTTER_DEBUG_CONTINUOUS_REDRAW = 1 << 6 + CLUTTER_DEBUG_CONTINUOUS_REDRAW = 1 << 6, + CLUTTER_DEBUG_PAINT_DEFORM_TILES = 1 << 7 } ClutterDrawDebugFlag; #ifdef CLUTTER_ENABLE_DEBUG diff --git a/clutter/clutter-deform-effect.c b/clutter/clutter-deform-effect.c index 8037a1d..5f1954e 100644 --- a/clutter/clutter-deform-effect.c +++ b/clutter/clutter-deform-effect.c @@ -291,7 +291,7 @@ clutter_deform_effect_paint_target (ClutterOffscreenEffect *effect) else if (priv->back_material == COGL_INVALID_HANDLE && is_cull_enabled) cogl_set_backface_culling_enabled (TRUE); - if (G_UNLIKELY (clutter_debug_flags & CLUTTER_DEBUG_PAINT_DEFORM_TILES)) + if (G_UNLIKELY (clutter_paint_debug_flags & CLUTTER_DEBUG_PAINT_DEFORM_TILES)) { cogl_set_source_color4f (1.0, 0, 0, 1.0); cogl_vertex_buffer_draw_elements (priv->vbo, diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c index 41f9393..d31b444 100644 --- a/clutter/clutter-main.c +++ b/clutter/clutter-main.c @@ -176,13 +176,12 @@ static const GDebugKey clutter_debug_keys[] = { { "layout", CLUTTER_DEBUG_LAYOUT }, { "clipping", CLUTTER_DEBUG_CLIPPING }, { "oob-transforms", CLUTTER_DEBUG_OOB_TRANSFORMS }, - { "paint-deform-tiles", CLUTTER_DEBUG_PAINT_DEFORM_TILES }, }; #endif /* CLUTTER_ENABLE_DEBUG */ static const GDebugKey clutter_pick_debug_keys[] = { { "nop-picking", CLUTTER_DEBUG_NOP_PICKING }, - { "dump-pick-buffers", CLUTTER_DEBUG_DUMP_PICK_BUFFERS } + { "dump-pick-buffers", CLUTTER_DEBUG_DUMP_PICK_BUFFERS }, }; static const GDebugKey clutter_paint_debug_keys[] = { @@ -192,7 +191,8 @@ static const GDebugKey clutter_paint_debug_keys[] = { { "paint-volumes", CLUTTER_DEBUG_PAINT_VOLUMES }, { "disable-culling", CLUTTER_DEBUG_DISABLE_CULLING }, { "disable-offscreen-redirect", CLUTTER_DEBUG_DISABLE_OFFSCREEN_REDIRECT }, - { "continuous-redraw", CLUTTER_DEBUG_CONTINUOUS_REDRAW } + { "continuous-redraw", CLUTTER_DEBUG_CONTINUOUS_REDRAW }, + { "paint-deform-tiles", CLUTTER_DEBUG_PAINT_DEFORM_TILES }, }; #ifdef CLUTTER_ENABLE_PROFILE -- 2.7.4