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)
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,
656 free(rc); 656 free(rc);
657} 657}
658 658
659typedef struct
660{
661 Evas_Public_Data *e;
662 Eina_Inarray *active_objects;
663 Eina_Array *render_objects;
664 Eina_Array *snapshot_objects;
665 Eina_Array *restack_objects;
666 Eina_Array *delete_objects;
667 int redraw_all;
668} Phase1_Context;
669
670#define RENDCACHE 1
671
672#ifdef RENDCACHE
659static Render_Cache * 673static Render_Cache *
660_evas_render_phase1_object_render_cache_new(void) 674_evas_render_phase1_object_render_cache_new(void)
661{ 675{
@@ -669,17 +683,6 @@ _evas_render_phase1_object_render_cache_new(void)
669 return rc; 683 return rc;
670} 684}
671 685
672typedef struct
673{
674 Evas_Public_Data *e;
675 Eina_Inarray *active_objects;
676 Eina_Array *render_objects;
677 Eina_Array *snapshot_objects;
678 Eina_Array *restack_objects;
679 Eina_Array *delete_objects;
680 int redraw_all;
681} Phase1_Context;
682
683static void 686static void
684_evas_render_phase1_object_ctx_render_cache_fill(Phase1_Context *ctx, 687_evas_render_phase1_object_ctx_render_cache_fill(Phase1_Context *ctx,
685 Render_Cache *rc) 688 Render_Cache *rc)
@@ -725,6 +728,7 @@ _evas_render_phase1_object_ctx_render_cache_append(Phase1_Context *ctx,
725 evas_render_update_del(ctx->e, r->x, r->y, r->w, r->h); 728 evas_render_update_del(ctx->e, r->x, r->y, r->w, r->h);
726 } 729 }
727} 730}
731#endif
728 732
729static Eina_Bool 733static Eina_Bool
730_evas_render_phase1_object_process(Phase1_Context *p1ctx, 734_evas_render_phase1_object_process(Phase1_Context *p1ctx,
@@ -824,8 +828,6 @@ _evas_render_phase1_object_mapped_had_restack(Phase1_Context *p1ctx,
824 evas_object_update_bounding_box(eo_obj, obj, NULL); 828 evas_object_update_bounding_box(eo_obj, obj, NULL);
825} 829}
826 830
827#define RENDCACHE 1
828
829static Eina_Bool 831static Eina_Bool
830_evas_render_phase1_object_changed_smart(Phase1_Context *p1ctx, 832_evas_render_phase1_object_changed_smart(Phase1_Context *p1ctx,
831 Evas_Object_Protected_Data *obj, 833 Evas_Object_Protected_Data *obj,
@@ -836,8 +838,6 @@ _evas_render_phase1_object_changed_smart(Phase1_Context *p1ctx,
836 int level) 838 int level)
837{ 839{
838 Evas_Object_Protected_Data *obj2; 840 Evas_Object_Protected_Data *obj2;
839 Render_Cache *rc = NULL;
840 void *p_del_redir;
841 Evas_Object *eo_obj = obj->object; 841 Evas_Object *eo_obj = obj->object;
842 842
843 RD(level, " changed + smart - render ok\n"); 843 RD(level, " changed + smart - render ok\n");
@@ -859,9 +859,12 @@ _evas_render_phase1_object_changed_smart(Phase1_Context *p1ctx,
859 else 859 else
860 { 860 {
861 Phase1_Context *ctx = p1ctx; 861 Phase1_Context *ctx = p1ctx;
862 Phase1_Context tmpctx;
863 862
864#ifdef RENDCACHE 863#ifdef RENDCACHE
864 Render_Cache *rc = NULL;
865 void *p_del_redir;
866 Phase1_Context tmpctx;
867
865 if (obj->no_change_render > 3) 868 if (obj->no_change_render > 3)
866 { 869 {
867 rc = evas_object_smart_render_cache_get(eo_obj); 870 rc = evas_object_smart_render_cache_get(eo_obj);
@@ -966,15 +969,16 @@ _evas_render_phase1_object_no_changed_smart(Phase1_Context *p1ctx,
966{ 969{
967 Evas_Object_Protected_Data *obj2; 970 Evas_Object_Protected_Data *obj2;
968 Phase1_Context *ctx = p1ctx; 971 Phase1_Context *ctx = p1ctx;
969 Phase1_Context tmpctx;
970 Render_Cache *rc = NULL;
971 void *p_del_redir;
972 Evas_Object *eo_obj = obj->object; 972 Evas_Object *eo_obj = obj->object;
973 973
974 RD(level, " smart + visible/was visible + not clip\n"); 974 RD(level, " smart + visible/was visible + not clip\n");
975 OBJ_ARRAY_PUSH(p1ctx->render_objects, obj); 975 OBJ_ARRAY_PUSH(p1ctx->render_objects, obj);
976 obj->render_pre = EINA_TRUE; 976 obj->render_pre = EINA_TRUE;
977#ifdef RENDCACHE 977#ifdef RENDCACHE
978 void *p_del_redir;
979 Render_Cache *rc = NULL;
980 Phase1_Context tmpctx;
981
978 if (obj->no_change_render > 3) 982 if (obj->no_change_render > 3)
979 { 983 {
980 rc = evas_object_smart_render_cache_get(eo_obj); 984 rc = evas_object_smart_render_cache_get(eo_obj);