summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2014-11-05 14:54:35 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2014-11-12 15:26:59 +0900
commit4fb138a65f943fafc17a4c4a2d084362c3c4cf0b (patch)
tree1312d3257116b63e4e09384c4446387cb0ac58cc /src/lib/evas/canvas
parent427415ac21905481db1547bd57fc1648e1d9eb09 (diff)
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.
Diffstat (limited to 'src/lib/evas/canvas')
-rw-r--r--src/lib/evas/canvas/evas_3d_texture.c6
-rw-r--r--src/lib/evas/canvas/evas_object_image.c6
-rw-r--r--src/lib/evas/canvas/evas_render.c69
3 files changed, 21 insertions, 60 deletions
diff --git a/src/lib/evas/canvas/evas_3d_texture.c b/src/lib/evas/canvas/evas_3d_texture.c
index 4aecbef607..9f46167b44 100644
--- a/src/lib/evas/canvas/evas_3d_texture.c
+++ b/src/lib/evas/canvas/evas_3d_texture.c
@@ -144,11 +144,7 @@ _texture_proxy_subrender(Evas_3D_Texture *obj)
144 -source->cur->geometry.x, 144 -source->cur->geometry.x,
145 -source->cur->geometry.y, 145 -source->cur->geometry.y,
146 1, 0, 0, e->output.w, e->output.h, 146 1, 0, 0, e->output.w, e->output.h,
147 &proxy_render_data 147 &proxy_render_data, 1, EINA_FALSE);
148#ifdef REND_DBG
149 , 1
150#endif
151 , EINA_FALSE);
152 } 148 }
153 149
154 e->engine.func->context_free(e->engine.data.output, ctx); 150 e->engine.func->context_free(e->engine.data.output, ctx);
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index fb0fc3e09d..5530af4d2f 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -2426,11 +2426,7 @@ _proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_proxy, Evas
2426 -source->cur->geometry.x, 2426 -source->cur->geometry.x,
2427 -source->cur->geometry.y, 2427 -source->cur->geometry.y,
2428 1, 0, 0, e->output.w, e->output.h, 2428 1, 0, 0, e->output.w, e->output.h,
2429 &proxy_render_data 2429 &proxy_render_data, 1, do_async);
2430#ifdef REND_DBG
2431 , 1
2432#endif
2433 , do_async);
2434 2430
2435 e->engine.func->context_free(e->engine.data.output, ctx); 2431 e->engine.func->context_free(e->engine.data.output, ctx);
2436 proxy_write->surface = e->engine.func->image_dirty_region 2432 proxy_write->surface = e->engine.func->image_dirty_region
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index dda7df11ac..f36b2591a7 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -390,11 +390,7 @@ _evas_render_phase1_object_process(Evas_Public_Data *e, Evas_Object *eo_obj,
390 int restack, 390 int restack,
391 int *redraw_all, 391 int *redraw_all,
392 Eina_Bool mapped_parent, 392 Eina_Bool mapped_parent,
393 Eina_Bool src_changed 393 Eina_Bool src_changed, int level)
394#ifdef REND_DBG
395 , int level
396#endif
397 )
398{ 394{
399 Eina_Bool clean_them = EINA_FALSE; 395 Eina_Bool clean_them = EINA_FALSE;
400 int is_active; 396 int is_active;
@@ -490,11 +486,8 @@ _evas_render_phase1_object_process(Evas_Public_Data *e, Evas_Object *eo_obj,
490 obj->restack, 486 obj->restack,
491 redraw_all, 487 redraw_all,
492 EINA_TRUE, 488 EINA_TRUE,
493 src_changed 489 src_changed,
494#ifdef REND_DBG 490 level + 1);
495 , level + 1
496#endif
497 );
498 } 491 }
499 } 492 }
500 } 493 }
@@ -544,11 +537,8 @@ _evas_render_phase1_object_process(Evas_Public_Data *e, Evas_Object *eo_obj,
544 obj->restack, 537 obj->restack,
545 redraw_all, 538 redraw_all,
546 mapped_parent, 539 mapped_parent,
547 src_changed 540 src_changed,
548#ifdef REND_DBG 541 level + 1);
549 , level + 1
550#endif
551 );
552 } 542 }
553 } 543 }
554 else 544 else
@@ -615,11 +605,8 @@ _evas_render_phase1_object_process(Evas_Public_Data *e, Evas_Object *eo_obj,
615 restack, 605 restack,
616 redraw_all, 606 redraw_all,
617 mapped_parent, 607 mapped_parent,
618 src_changed 608 src_changed,
619#ifdef REND_DBG 609 level + 1);
620 , level + 1
621#endif
622 );
623 } 610 }
624 } 611 }
625 else 612 else
@@ -661,11 +648,8 @@ _evas_render_phase1_object_process(Evas_Public_Data *e, Evas_Object *eo_obj,
661 delete_objects, 648 delete_objects,
662 render_objects, 649 render_objects,
663 restack, 650 restack,
664 redraw_all 651 redraw_all,
665#ifdef REND_DBG 652 level + 1);
666 , level + 1
667#endif
668 );
669 } 653 }
670 } 654 }
671*/ 655*/
@@ -696,11 +680,7 @@ _evas_render_phase1_process(Evas_Public_Data *e,
696 { 680 {
697 clean_them |= _evas_render_phase1_object_process 681 clean_them |= _evas_render_phase1_object_process
698 (e, obj->object, active_objects, restack_objects, delete_objects, 682 (e, obj->object, active_objects, restack_objects, delete_objects,
699 render_objects, 0, redraw_all, EINA_FALSE, EINA_FALSE 683 render_objects, 0, redraw_all, EINA_FALSE, EINA_FALSE, 1);
700#ifdef REND_DBG
701 , 1
702#endif
703 );
704 } 684 }
705 } 685 }
706 RD(" ---]\n"); 686 RD(" ---]\n");
@@ -1126,11 +1106,8 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
1126 Evas_Object_Protected_Data *obj, void *context, 1106 Evas_Object_Protected_Data *obj, void *context,
1127 void *surface, int off_x, int off_y, int mapped, int ecx, 1107 void *surface, int off_x, int off_y, int mapped, int ecx,
1128 int ecy, int ecw, int ech, 1108 int ecy, int ecw, int ech,
1129 Evas_Proxy_Render_Data *proxy_render_data 1109 Evas_Proxy_Render_Data *proxy_render_data, int level,
1130#ifdef REND_DBG 1110 Eina_Bool do_async)
1131 , int level
1132#endif
1133 , Eina_Bool do_async)
1134{ 1111{
1135 void *ctx; 1112 void *ctx;
1136 Evas_Object_Protected_Data *obj2; 1113 Evas_Object_Protected_Data *obj2;
@@ -1299,11 +1276,9 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
1299 obj->map->surface, 1276 obj->map->surface,
1300 off_x2, off_y2, 1, 1277 off_x2, off_y2, 1,
1301 ecx, ecy, ecw, ech, 1278 ecx, ecy, ecw, ech,
1302 proxy_render_data 1279 proxy_render_data,
1303#ifdef REND_DBG 1280 level + 1,
1304 , level + 1 1281 do_async);
1305#endif
1306 , do_async);
1307 /* We aren't sure this object will be rendered by 1282 /* We aren't sure this object will be rendered by
1308 normal(not proxy) drawing after, we reset this 1283 normal(not proxy) drawing after, we reset this
1309 only in case of normal drawing. For optmizing, 1284 only in case of normal drawing. For optmizing,
@@ -1429,11 +1404,9 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
1429 obj2, ctx, surface, 1404 obj2, ctx, surface,
1430 off_x, off_y, 1, 1405 off_x, off_y, 1,
1431 ecx, ecy, ecw, ech, 1406 ecx, ecy, ecw, ech,
1432 proxy_render_data 1407 proxy_render_data,
1433#ifdef REND_DBG 1408 level + 1,
1434 , level + 1 1409 do_async);
1435#endif
1436 , do_async);
1437 /* We aren't sure this object will be rendered by 1410 /* We aren't sure this object will be rendered by
1438 normal(not proxy) drawing after, we reset this 1411 normal(not proxy) drawing after, we reset this
1439 only in case of normal drawing. For optmizing, 1412 only in case of normal drawing. For optmizing,
@@ -1967,11 +1940,7 @@ evas_render_updates_internal(Evas *eo_e,
1967 surface, off_x + fx, 1940 surface, off_x + fx,
1968 off_y + fy, 0, 1941 off_y + fy, 0,
1969 cx, cy, cw, ch, 1942 cx, cy, cw, ch,
1970 NULL 1943 NULL, 1, do_async);
1971#ifdef REND_DBG
1972 , 1
1973#endif
1974 , do_async);
1975 e->engine.func->context_cutout_clear(e->engine.data.output, 1944 e->engine.func->context_cutout_clear(e->engine.data.output,
1976 e->engine.data.context); 1945 e->engine.data.context);
1977 } 1946 }