jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4227bae2b667af9030f58b62fb5c866416f6c806
commit 4227bae2b667af9030f58b62fb5c866416f6c806
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Thu Apr 16 17:36:32 2015 +0900
Evas render: Fix debug logs
Those are only printed out if REND_DBG is set to 1 in evas_private.h
--> Non functional change.
---
src/lib/evas/canvas/evas_render.c | 31 +++++++++++--------------------
1 file changed, 11 insertions(+), 20 deletions(-)
diff --git a/src/lib/evas/canvas/evas_render.c
b/src/lib/evas/canvas/evas_render.c
index 7d398b1..68504e2 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -391,10 +391,7 @@ _evas_render_phase1_direct(Evas_Public_Data *e,
eo_obj = obj->object;
RD(0, " OBJ [%p", obj);
- if (obj->name)
- {
- RD(0, ":%s", obj->name);
- }
+ if (obj->name) RD(0, " '%s'", obj->name);
RD(0, "] changed %i\n", obj->changed);
if (obj->changed)
@@ -498,8 +495,8 @@ _evas_render_phase1_object_process(Evas_Public_Data *e,
Evas_Object *eo_obj,
obj->is_active = is_active;
#ifdef REND_DBG
- RD(level, "[--- PROCESS [%p", obj);
- if (obj->name) RD(0, ":%s", obj->name);
+ RD(level, "[--- PROCESS [%p (eo: %p)", obj, obj->object);
+ if (obj->name) RD(0, " '%s'", obj->name);
RD(0, "] '%s' active = %i, del = %i | %i %i %ix%i\n", obj->type, is_active,
obj->delete_me, obj->cur->geometry.x, obj->cur->geometry.y,
obj->cur->geometry.w, obj->cur->geometry.h);
#endif
@@ -510,7 +507,7 @@ _evas_render_phase1_object_process(Evas_Public_Data *e,
Evas_Object *eo_obj,
if (!is_active)
{
RD(level, "[%p", obj);
- if (obj->name) RD(0, ":%s", obj->name);
+ if (obj->name) RD(0, " '%s'", obj->name);
RD(0, "] vis: %i, cache.clip.vis: %i cache.clip.a: %i [%p]\n",
obj->cur->visible, obj->cur->cache.clip.visible, obj->cur->cache.clip.a,
obj->func->is_visible);
}
#endif
@@ -875,10 +872,7 @@ pending_change(void *data, void *gdata EINA_UNUSED)
if (obj->pre_render_done)
{
RD(0, " OBJ [%p", obj);
- if (obj->name)
- {
- RD(0, ":%s", obj->name);
- }
+ if (obj->name) RD(0, " '%s'", obj->name);
RD(0, "] pending change %i -> 0, pre %i\n", obj->changed,
obj->pre_render_done);
obj->func->render_post(eo_obj, obj, obj->private_data);
obj->pre_render_done = EINA_FALSE;
@@ -1230,11 +1224,11 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object
*eo_obj,
#ifdef REND_DBG
RD(level, "{\n");
RD(level, " evas_render_mapped(evas:%p, obj:%p", e, obj);
- if (obj->name) RD(0, ":\"%s\"", obj->name);
+ if (obj->name) RD(0, " '%s'", obj->name);
RD(0, ", ctx:%p, sfc:%p, offset:%i,%i, %s, use_mapped_ctx:%d, %s)\n",
context, surface, off_x, off_y,
mapped ? "mapped" : "normal", use_mapped_ctx, do_async ? "async" :
"sync");
RD(level, " obj: '%s' %s", obj->type, obj->is_smart ? "(smart) " : "");
- if (obj->name) RD(0, "\"%s\"\n", obj->name);
+ if (obj->name) RD(0, " '%s'\n", obj->name);
else RD(0, "\n");
if (obj->cur->clipper)
{
@@ -2136,7 +2130,7 @@ evas_render_updates_internal(Evas *eo_e,
#endif
evas_call_smarts_calculate(eo_e);
- RD(0, "[--- RENDER EVAS (size: %ix%i)\n", e->viewport.w, e->viewport.h);
+ RD(0, "[--- RENDER EVAS (size: %ix%i): %p (eo %p)\n", e->viewport.w,
e->viewport.h, e, eo_e);
_cb_always_call(eo_e, EVAS_CALLBACK_RENDER_PRE, NULL);
@@ -2389,10 +2383,7 @@ evas_render_updates_internal(Evas *eo_e,
/* if it's in our outpout rect and it doesn't clip anything
*/
RD(0, " OBJ: [%p", obj);
- if (obj->name)
- {
- RD(0, ":%s", obj->name);
- }
+ if (obj->name) RD(0, " '%s'", obj->name);
RD(0, "] '%s' %i %i %ix%i\n", obj->type,
obj->cur->geometry.x, obj->cur->geometry.y, obj->cur->geometry.w,
obj->cur->geometry.h);
if ((evas_object_is_in_output_rect(eo_obj, obj, ux - fx, uy
- fy, uw, uh) ||
(obj->is_smart)) &&
@@ -2528,12 +2519,12 @@ evas_render_updates_internal(Evas *eo_e,
eo_obj = obj->object;
obj->pre_render_done = EINA_FALSE;
RD(0, " OBJ [%p", obj);
- if (obj->name) RD(0, ":%s", obj->name);
+ if (obj->name) RD(0, " '%s'", obj->name);
RD(0, "] changed:%i do_draw:%i (%s)\n", obj->changed, do_draw,
obj->type);
if ((clean_them) || (obj->changed && do_draw))
{
RD(0, " OBJ [%p", obj);
- if (obj->name) RD(0, ":%s", obj->name);
+ if (obj->name) RD(0, " '%s'", obj->name);
RD(0, "] render_post()\n");
obj->func->render_post(eo_obj, obj, obj->private_data);
obj->restack = EINA_FALSE;
--
