From bc3f053287497ffee498b58f2830aed3e05ba486 Mon Sep 17 00:00:00 2001 From: Rafael Antognolli Date: Wed, 12 Sep 2012 19:00:16 +0000 Subject: [PATCH] evas/render: Move REND_DGB macro to evas_private.h. This will make it easier to enable it, since the changes to evas_render_mapped signature will can be done everywhere, not only inside evas_render.c. SVN revision: 76552 --- legacy/evas/src/lib/canvas/evas_object_image.c | 6 +++++- legacy/evas/src/lib/canvas/evas_render.c | 6 ++++-- legacy/evas/src/lib/include/evas_private.h | 8 +++++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_image.c b/legacy/evas/src/lib/canvas/evas_object_image.c index a46c292f8e..28ffb4d738 100644 --- a/legacy/evas/src/lib/canvas/evas_object_image.c +++ b/legacy/evas/src/lib/canvas/evas_object_image.c @@ -2351,7 +2351,11 @@ _proxy_subrender(Evas *e, Evas_Object *source) evas_render_mapped(e, source, ctx, source->proxy.surface, -source->cur.geometry.x, -source->cur.geometry.y, - 1, 0, 0, e->output.w, e->output.h); + 1, 0, 0, e->output.w, e->output.h +#ifdef REND_DGB + , 1 +#endif + ); e->engine.func->context_free(e->engine.data.output, ctx); source->proxy.surface = e->engine.func->image_dirty_region (e->engine.data.output, source->proxy.surface, 0, 0, w, h); diff --git a/legacy/evas/src/lib/canvas/evas_render.c b/legacy/evas/src/lib/canvas/evas_render.c index b340ceee19..7c5ce10fc0 100644 --- a/legacy/evas/src/lib/canvas/evas_render.c +++ b/legacy/evas/src/lib/canvas/evas_render.c @@ -5,8 +5,10 @@ #include "evas_cs2_private.h" #endif -// debug rendering -/* #define REND_DGB 1 */ +/* debug rendering + * NOTE: Define REND_DGB 1 in evas_private.h to enable debugging. Don't define + * it here since the flag is used on other places too. */ + /* #define STDOUT_DBG 1 */ #ifdef REND_DGB diff --git a/legacy/evas/src/lib/include/evas_private.h b/legacy/evas/src/lib/include/evas_private.h index 16c749b317..e34070e115 100644 --- a/legacy/evas/src/lib/include/evas_private.h +++ b/legacy/evas/src/lib/include/evas_private.h @@ -22,6 +22,8 @@ #define RENDER_METHOD_INVALID 0x00000000 +/* #define REND_DGB 1 */ + typedef struct _Evas_Layer Evas_Layer; typedef struct _Evas_Size Evas_Size; typedef struct _Evas_Aspect Evas_Aspect; @@ -1072,7 +1074,11 @@ EAPI const char *_evas_module_libdir_get(void); Eina_Bool evas_render_mapped(Evas *e, Evas_Object *obj, void *context, void *surface, int off_x, int off_y, int mapped, - int ecx, int ecy, int ecw, int ech); + int ecx, int ecy, int ecw, int ech +#ifdef REND_DGB + , int level +#endif + ); void evas_render_invalidate(Evas *e); void evas_render_object_recalc(Evas_Object *obj);