enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

Evas: Remove ugly REND_DBG 

Here's a macro that's used for debugging in some of the ugliest
ways possible: avoid passing an extra argument to a function when the
cost of always passing it is negligible (it's an int).

Fixes T1749.
This commit is contained in:
Jean-Philippe Andre 2014-11-05 14:54:35 +09:00
parent 427415ac21
commit 4fb138a65f
5 changed files with 24 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/evas/canvas/evas_3d_texture.c
View File

@ -144,11 +144,7 @@ _texture_proxy_subrender(Evas_3D_Texture *obj)
-source->cur->geometry.x,
-source->cur->geometry.y,
1, 0, 0, e->output.w, e->output.h,
&proxy_render_data
#ifdef REND_DBG
, 1
#endif
, EINA_FALSE);
&proxy_render_data, 1, EINA_FALSE);
}
e->engine.func->context_free(e->engine.data.output, ctx);

6
src/lib/evas/canvas/evas_object_image.c
View File

@ -2426,11 +2426,7 @@ _proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_proxy, Evas
-source->cur->geometry.x,
-source->cur->geometry.y,
1, 0, 0, e->output.w, e->output.h,
&proxy_render_data
#ifdef REND_DBG
, 1
#endif
, do_async);
&proxy_render_data, 1, do_async);
e->engine.func->context_free(e->engine.data.output, ctx);
proxy_write->surface = e->engine.func->image_dirty_region

69
src/lib/evas/canvas/evas_render.c
View File

@ -390,11 +390,7 @@ _evas_render_phase1_object_process(Evas_Public_Data *e, Evas_Object *eo_obj,
int restack,
int *redraw_all,
Eina_Bool mapped_parent,
Eina_Bool src_changed
#ifdef REND_DBG
, int level
#endif
)
Eina_Bool src_changed, int level)
{
Eina_Bool clean_them = EINA_FALSE;
int is_active;
@ -490,11 +486,8 @@ _evas_render_phase1_object_process(Evas_Public_Data *e, Evas_Object *eo_obj,
obj->restack,
redraw_all,
EINA_TRUE,
src_changed
#ifdef REND_DBG
, level + 1
#endif
);
src_changed,
level + 1);
}
}
}
@ -544,11 +537,8 @@ _evas_render_phase1_object_process(Evas_Public_Data *e, Evas_Object *eo_obj,
obj->restack,
redraw_all,
mapped_parent,
src_changed
#ifdef REND_DBG
, level + 1
#endif
);
src_changed,
level + 1);
}
}
else
@ -615,11 +605,8 @@ _evas_render_phase1_object_process(Evas_Public_Data *e, Evas_Object *eo_obj,
restack,
redraw_all,
mapped_parent,
src_changed
#ifdef REND_DBG
, level + 1
#endif
);
src_changed,
level + 1);
}
}
else
@ -661,11 +648,8 @@ _evas_render_phase1_object_process(Evas_Public_Data *e, Evas_Object *eo_obj,
delete_objects,
render_objects,
restack,
redraw_all
#ifdef REND_DBG
, level + 1
#endif
);
redraw_all,
level + 1);
}
}
*/
@ -696,11 +680,7 @@ _evas_render_phase1_process(Evas_Public_Data *e,
{
clean_them |= _evas_render_phase1_object_process
(e, obj->object, active_objects, restack_objects, delete_objects,
render_objects, 0, redraw_all, EINA_FALSE, EINA_FALSE
#ifdef REND_DBG
, 1
#endif
);
render_objects, 0, redraw_all, EINA_FALSE, EINA_FALSE, 1);
}
}
RD(" ---]\n");
@ -1126,11 +1106,8 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
Evas_Object_Protected_Data *obj, void *context,
void *surface, int off_x, int off_y, int mapped, int ecx,
int ecy, int ecw, int ech,
Evas_Proxy_Render_Data *proxy_render_data
#ifdef REND_DBG
, int level
#endif
, Eina_Bool do_async)
Evas_Proxy_Render_Data *proxy_render_data, int level,
Eina_Bool do_async)
{
void *ctx;
Evas_Object_Protected_Data *obj2;
@ -1299,11 +1276,9 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
obj->map->surface,
off_x2, off_y2, 1,
ecx, ecy, ecw, ech,
proxy_render_data
#ifdef REND_DBG
, level + 1
#endif
, do_async);
proxy_render_data,
level + 1,
do_async);
/* We aren't sure this object will be rendered by
normal(not proxy) drawing after, we reset this
only in case of normal drawing. For optmizing,
@ -1429,11 +1404,9 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
obj2, ctx, surface,
off_x, off_y, 1,
ecx, ecy, ecw, ech,
proxy_render_data
#ifdef REND_DBG
, level + 1
#endif
, do_async);
proxy_render_data,
level + 1,
do_async);
/* We aren't sure this object will be rendered by
normal(not proxy) drawing after, we reset this
only in case of normal drawing. For optmizing,
@ -1967,11 +1940,7 @@ evas_render_updates_internal(Evas *eo_e,
surface, off_x + fx,
off_y + fy, 0,
cx, cy, cw, ch,
NULL
#ifdef REND_DBG
, 1
#endif
, do_async);
NULL, 1, do_async);
e->engine.func->context_cutout_clear(e->engine.data.output,
e->engine.data.context);
}

6
src/lib/evas/filters/evas_filter.c
View File

@ -262,11 +262,7 @@ _proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_proxy,
-source->cur->geometry.x,
-source->cur->geometry.y,
1, 0, 0, e->output.w, e->output.h,
&proxy_render_data
#ifdef REND_DBG
, 1
#endif
, do_async);
&proxy_render_data, 1, do_async);
e->engine.func->context_free(e->engine.data.output, ctx);
proxy_write->surface = e->engine.func->image_dirty_region

7
src/lib/evas/include/evas_private.h
View File

@ -1680,11 +1680,8 @@ Eina_Bool evas_render_mapped(Evas_Public_Data *e, Evas_Object *obj,
Evas_Object_Protected_Data *source_pd,
void *context, void *surface, int off_x, int off_y,
int mapped, int ecx, int ecy, int ecw, int ech,
Evas_Proxy_Render_Data *proxy_render_data
#ifdef REND_DBG
, int level
#endif
, Eina_Bool do_async);
Evas_Proxy_Render_Data *proxy_render_data,
int level, Eina_Bool do_async);
void evas_render_invalidate(Evas *e);
void evas_render_object_recalc(Evas_Object *obj);