summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHermet Park <hermetpark@gmail.com>2018-05-29 16:25:54 +0900
committerHermet Park <hermetpark@gmail.com>2018-05-29 16:28:35 +0900
commitbe34971af8d532b83601d9b33e7d6b373899ae03 (patch)
tree2ef7c0c6e5e6291a2f50eeddcba388b71091c762
parentbb2037748a763b5e6025812d13750f5ed5e933e0 (diff)
downloadefl-be34971af8d532b83601d9b33e7d6b373899ae03.tar.gz
evas render: remove compile warnings.
Some bunch of code is unused when RENDCACHE is disabled. Migrated them into RENDCACHE scope. No logical changes actually.
-rw-r--r--src/lib/evas/canvas/evas_render.c42
1 files changed, 23 insertions, 19 deletions
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index d6373a2d49..17c32a8528 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -656,6 +656,20 @@ evas_render_object_render_cache_free(Evas_Object *eo_obj EINA_UNUSED,
free(rc);
}
+typedef struct
+{
+ Evas_Public_Data *e;
+ Eina_Inarray *active_objects;
+ Eina_Array *render_objects;
+ Eina_Array *snapshot_objects;
+ Eina_Array *restack_objects;
+ Eina_Array *delete_objects;
+ int redraw_all;
+} Phase1_Context;
+
+#define RENDCACHE 1
+
+#ifdef RENDCACHE
static Render_Cache *
_evas_render_phase1_object_render_cache_new(void)
{
@@ -669,17 +683,6 @@ _evas_render_phase1_object_render_cache_new(void)
return rc;
}
-typedef struct
-{
- Evas_Public_Data *e;
- Eina_Inarray *active_objects;
- Eina_Array *render_objects;
- Eina_Array *snapshot_objects;
- Eina_Array *restack_objects;
- Eina_Array *delete_objects;
- int redraw_all;
-} Phase1_Context;
-
static void
_evas_render_phase1_object_ctx_render_cache_fill(Phase1_Context *ctx,
Render_Cache *rc)
@@ -725,6 +728,7 @@ _evas_render_phase1_object_ctx_render_cache_append(Phase1_Context *ctx,
evas_render_update_del(ctx->e, r->x, r->y, r->w, r->h);
}
}
+#endif
static Eina_Bool
_evas_render_phase1_object_process(Phase1_Context *p1ctx,
@@ -824,8 +828,6 @@ _evas_render_phase1_object_mapped_had_restack(Phase1_Context *p1ctx,
evas_object_update_bounding_box(eo_obj, obj, NULL);
}
-#define RENDCACHE 1
-
static Eina_Bool
_evas_render_phase1_object_changed_smart(Phase1_Context *p1ctx,
Evas_Object_Protected_Data *obj,
@@ -836,8 +838,6 @@ _evas_render_phase1_object_changed_smart(Phase1_Context *p1ctx,
int level)
{
Evas_Object_Protected_Data *obj2;
- Render_Cache *rc = NULL;
- void *p_del_redir;
Evas_Object *eo_obj = obj->object;
RD(level, " changed + smart - render ok\n");
@@ -859,9 +859,12 @@ _evas_render_phase1_object_changed_smart(Phase1_Context *p1ctx,
else
{
Phase1_Context *ctx = p1ctx;
- Phase1_Context tmpctx;
#ifdef RENDCACHE
+ Render_Cache *rc = NULL;
+ void *p_del_redir;
+ Phase1_Context tmpctx;
+
if (obj->no_change_render > 3)
{
rc = evas_object_smart_render_cache_get(eo_obj);
@@ -966,15 +969,16 @@ _evas_render_phase1_object_no_changed_smart(Phase1_Context *p1ctx,
{
Evas_Object_Protected_Data *obj2;
Phase1_Context *ctx = p1ctx;
- Phase1_Context tmpctx;
- Render_Cache *rc = NULL;
- void *p_del_redir;
Evas_Object *eo_obj = obj->object;
RD(level, " smart + visible/was visible + not clip\n");
OBJ_ARRAY_PUSH(p1ctx->render_objects, obj);
obj->render_pre = EINA_TRUE;
#ifdef RENDCACHE
+ void *p_del_redir;
+ Render_Cache *rc = NULL;
+ Phase1_Context tmpctx;
+
if (obj->no_change_render > 3)
{
rc = evas_object_smart_render_cache_get(eo_obj);