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

debug: Clean up debugging notes

Browse source
This commit is contained in:
Emmanuele Bassi 2011-10-17 10:24:25 +01:00
parent f75dfcfd8b
commit 146e15297f
11 changed files with 29 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clutter/clutter-backend.c
View file

@ -465,7 +465,7 @@ _clutter_backend_ensure_context (ClutterBackend *backend,
{ {
new_stage = NULL; new_stage = NULL;
CLUTTER_NOTE (MULTISTAGE, CLUTTER_NOTE (BACKEND,
"Stage [%p] is not realized, unsetting the stage", "Stage [%p] is not realized, unsetting the stage",
stage); stage);
} }
@ -473,7 +473,7 @@ _clutter_backend_ensure_context (ClutterBackend *backend,
{ {
new_stage = stage; new_stage = stage;
CLUTTER_NOTE (MULTISTAGE, CLUTTER_NOTE (BACKEND,
"Setting the new stage [%p]", "Setting the new stage [%p]",
new_stage); new_stage);
} }
@ -515,7 +515,7 @@ _clutter_backend_ensure_context (ClutterBackend *backend,
current_context_stage = new_stage; current_context_stage = new_stage;
} }
else else
CLUTTER_NOTE (MULTISTAGE, "Stage is the same"); CLUTTER_NOTE (BACKEND, "Stage is the same");
} }

2
clutter/clutter-bezier.c
View file

@ -180,7 +180,7 @@ _clutter_bezier_advance (const ClutterBezier *b, gint L, ClutterKnot * knot)
knot->x = _clutter_bezier_t2x (b, t); knot->x = _clutter_bezier_t2x (b, t);
knot->y = _clutter_bezier_t2y (b, t); knot->y = _clutter_bezier_t2y (b, t);
CLUTTER_NOTE (BEHAVIOUR, "advancing to relative pt %f: t %f, {%d,%d}", CLUTTER_NOTE (MISC, "advancing to relative pt %f: t %f, {%d,%d}",
(double) L / (double) CBZ_T_ONE, (double) L / (double) CBZ_T_ONE,
(double) t / (double) CBZ_T_ONE, (double) t / (double) CBZ_T_ONE,
knot->x, knot->y); knot->x, knot->y);

27
clutter/clutter-debug.h
View file

@ -13,21 +13,18 @@ typedef enum {
CLUTTER_DEBUG_TEXTURE = 1 << 2, CLUTTER_DEBUG_TEXTURE = 1 << 2,
CLUTTER_DEBUG_EVENT = 1 << 3, CLUTTER_DEBUG_EVENT = 1 << 3,
CLUTTER_DEBUG_PAINT = 1 << 4, CLUTTER_DEBUG_PAINT = 1 << 4,
CLUTTER_DEBUG_GL = 1 << 5, CLUTTER_DEBUG_PANGO = 1 << 5,
CLUTTER_DEBUG_ALPHA = 1 << 6, CLUTTER_DEBUG_BACKEND = 1 << 6,
CLUTTER_DEBUG_BEHAVIOUR = 1 << 7, CLUTTER_DEBUG_SCHEDULER = 1 << 7,
CLUTTER_DEBUG_PANGO = 1 << 8, CLUTTER_DEBUG_SCRIPT = 1 << 8,
CLUTTER_DEBUG_BACKEND = 1 << 9, CLUTTER_DEBUG_SHADER = 1 << 9,
CLUTTER_DEBUG_SCHEDULER = 1 << 10, CLUTTER_DEBUG_MULTISTAGE = 1 << 10,
CLUTTER_DEBUG_SCRIPT = 1 << 11, CLUTTER_DEBUG_ANIMATION = 1 << 11,
CLUTTER_DEBUG_SHADER = 1 << 12, CLUTTER_DEBUG_LAYOUT = 1 << 12,
CLUTTER_DEBUG_MULTISTAGE = 1 << 13, CLUTTER_DEBUG_PICK = 1 << 13,
CLUTTER_DEBUG_ANIMATION = 1 << 14, CLUTTER_DEBUG_EVENTLOOP = 1 << 14,
CLUTTER_DEBUG_LAYOUT = 1 << 15, CLUTTER_DEBUG_CLIPPING = 1 << 15,
CLUTTER_DEBUG_PICK = 1 << 16, CLUTTER_DEBUG_OOB_TRANSFORMS = 1 << 16
CLUTTER_DEBUG_EVENTLOOP = 1 << 17,
CLUTTER_DEBUG_CLIPPING = 1 << 18,
CLUTTER_DEBUG_OOB_TRANSFORMS = 1 << 19
} ClutterDebugFlag; } ClutterDebugFlag;
typedef enum { typedef enum {

4
clutter/clutter-main.c
View file

@ -163,15 +163,11 @@ static const GDebugKey clutter_debug_keys[] = {
{ "event", CLUTTER_DEBUG_EVENT }, { "event", CLUTTER_DEBUG_EVENT },
{ "paint", CLUTTER_DEBUG_PAINT }, { "paint", CLUTTER_DEBUG_PAINT },
{ "pick", CLUTTER_DEBUG_PICK }, { "pick", CLUTTER_DEBUG_PICK },
{ "gl", CLUTTER_DEBUG_GL },
{ "alpha", CLUTTER_DEBUG_ALPHA },
{ "behaviour", CLUTTER_DEBUG_BEHAVIOUR },
{ "pango", CLUTTER_DEBUG_PANGO }, { "pango", CLUTTER_DEBUG_PANGO },
{ "backend", CLUTTER_DEBUG_BACKEND }, { "backend", CLUTTER_DEBUG_BACKEND },
{ "scheduler", CLUTTER_DEBUG_SCHEDULER }, { "scheduler", CLUTTER_DEBUG_SCHEDULER },
{ "script", CLUTTER_DEBUG_SCRIPT }, { "script", CLUTTER_DEBUG_SCRIPT },
{ "shader", CLUTTER_DEBUG_SHADER }, { "shader", CLUTTER_DEBUG_SHADER },
{ "multistage", CLUTTER_DEBUG_MULTISTAGE },
{ "animation", CLUTTER_DEBUG_ANIMATION }, { "animation", CLUTTER_DEBUG_ANIMATION },
{ "layout", CLUTTER_DEBUG_LAYOUT }, { "layout", CLUTTER_DEBUG_LAYOUT },
{ "clipping", CLUTTER_DEBUG_CLIPPING }, { "clipping", CLUTTER_DEBUG_CLIPPING },

2
clutter/deprecated/clutter-behaviour-depth.c
View file

@ -91,7 +91,7 @@ clutter_behaviour_depth_alpha_notify (ClutterBehaviour *behaviour,
depth = (alpha_value * (priv->depth_end - priv->depth_start)) depth = (alpha_value * (priv->depth_end - priv->depth_start))
+ priv->depth_start; + priv->depth_start;
CLUTTER_NOTE (BEHAVIOUR, "alpha: %.4f, depth: %d", alpha_value, depth); CLUTTER_NOTE (ANIMATION, "alpha: %.4f, depth: %d", alpha_value, depth);
clutter_behaviour_actors_foreach (behaviour, clutter_behaviour_actors_foreach (behaviour,
alpha_notify_foreach, alpha_notify_foreach,

2
clutter/deprecated/clutter-behaviour-ellipse.c
View file

@ -176,7 +176,7 @@ clutter_behaviour_ellipse_advance (ClutterBehaviourEllipse *e,
knot->y = y; knot->y = y;
knot->z = z; knot->z = z;
CLUTTER_NOTE (BEHAVIOUR, "advancing to angle %.2f [%d, %d] (a: %d, b: %d)", CLUTTER_NOTE (ANIMATION, "advancing to angle %.2f [%d, %d] (a: %d, b: %d)",
angle, angle,
knot->x, knot->y, knot->x, knot->y,
priv->a, priv->b); priv->a, priv->b);

2
clutter/deprecated/clutter-behaviour-opacity.c
View file

@ -97,7 +97,7 @@ clutter_behaviour_alpha_notify (ClutterBehaviour *behave,
* (priv->opacity_end - priv->opacity_start) * (priv->opacity_end - priv->opacity_start)
+ priv->opacity_start; + priv->opacity_start;
CLUTTER_NOTE (BEHAVIOUR, "alpha: %.4f, opacity: %u", CLUTTER_NOTE (ANIMATION, "alpha: %.4f, opacity: %u",
alpha_value, alpha_value,
opacity); opacity);

2
clutter/deprecated/clutter-behaviour-path.c
View file

@ -128,7 +128,7 @@ actor_apply_knot_foreach (ClutterBehaviour *behaviour,
{ {
ClutterKnot *knot = data; ClutterKnot *knot = data;
CLUTTER_NOTE (BEHAVIOUR, "Setting actor to %ix%i", knot->x, knot->y); CLUTTER_NOTE (ANIMATION, "Setting actor to %ix%i", knot->x, knot->y);
clutter_actor_set_position (actor, knot->x, knot->y); clutter_actor_set_position (actor, knot->x, knot->y);
} }

12
clutter/deprecated/clutter-behaviour.c
View file

@ -518,17 +518,17 @@ notify_cb (GObject *object,
klass = CLUTTER_BEHAVIOUR_GET_CLASS (behave); klass = CLUTTER_BEHAVIOUR_GET_CLASS (behave);
CLUTTER_NOTE (BEHAVIOUR, "notify::alpha"); CLUTTER_NOTE (ANIMATION, "notify::alpha");
/* no actors, we can stop right here */ /* no actors, we can stop right here */
if (behave->priv->actors == NULL) if (behave->priv->actors == NULL)
return; return;
if (klass->alpha_notify) if (klass->alpha_notify != NULL)
{ {
gdouble alpha_value = clutter_alpha_get_alpha (behave->priv->alpha); gdouble alpha_value = clutter_alpha_get_alpha (behave->priv->alpha);
CLUTTER_NOTE (BEHAVIOUR, "calling %s::alpha_notify (%p, %.4f)", CLUTTER_NOTE (ANIMATION, "calling %s::alpha_notify (%p, %.4f)",
g_type_name (G_TYPE_FROM_CLASS (klass)), g_type_name (G_TYPE_FROM_CLASS (klass)),
behave, alpha_value); behave, alpha_value);
@ -571,7 +571,7 @@ clutter_behaviour_set_alpha (ClutterBehaviour *behave,
if (priv->notify_id) if (priv->notify_id)
{ {
CLUTTER_NOTE (BEHAVIOUR, "removing previous notify-id (%d)", CLUTTER_NOTE (ANIMATION, "removing previous notify-id (%d)",
priv->notify_id); priv->notify_id);
g_signal_handler_disconnect (priv->alpha, priv->notify_id); g_signal_handler_disconnect (priv->alpha, priv->notify_id);
@ -580,7 +580,7 @@ clutter_behaviour_set_alpha (ClutterBehaviour *behave,
if (priv->alpha != NULL) if (priv->alpha != NULL)
{ {
CLUTTER_NOTE (BEHAVIOUR, "removing previous alpha object"); CLUTTER_NOTE (ANIMATION, "removing previous alpha object");
g_object_unref (priv->alpha); g_object_unref (priv->alpha);
priv->alpha = NULL; priv->alpha = NULL;
@ -594,7 +594,7 @@ clutter_behaviour_set_alpha (ClutterBehaviour *behave,
G_CALLBACK(notify_cb), G_CALLBACK(notify_cb),
behave); behave);
CLUTTER_NOTE (BEHAVIOUR, "setting new alpha object (%p, notify:%d)", CLUTTER_NOTE (ANIMATION, "setting new alpha object (%p, notify:%d)",
priv->alpha, priv->notify_id); priv->alpha, priv->notify_id);
} }

2
clutter/wayland/clutter-backend-wayland.c
View file

@ -401,7 +401,7 @@ try_create_context (ClutterBackend *backend,
goto fail; goto fail;
} }
CLUTTER_NOTE (GL, "Created EGL Context"); CLUTTER_NOTE (BACKEND, "Created EGL Context");
} }
if (!eglMakeCurrent (backend_wayland->edpy, if (!eglMakeCurrent (backend_wayland->edpy,

4
clutter/win32/clutter-event-win32.c
View file

@ -440,8 +440,8 @@ clutter_win32_handle_event (const MSG *msg)
break; break;
case WM_PAINT: case WM_PAINT:
CLUTTER_NOTE (MULTISTAGE, "expose for stage:%p, redrawing", stage); CLUTTER_NOTE (BACKEND, "expose for stage:%p, redrawing", stage);
clutter_redraw (stage); clutter_stage_ensure_redraw (stage);
break; break;
case WM_DESTROY: case WM_DESTROY: