summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2015-01-21 15:14:50 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-01-21 17:38:22 +0900
commit0793dee86ae9f80f63f70b170c3f5ec15946824f (patch)
treeedcbf91c42400d6b34226f51f525a6699066b168 /src/lib/evas/canvas
parent30a23118798d6d07628f4a0a8612bf8403d2e0ea (diff)
Evas masking: Try to reduce memory footprint a little
Move some mask object pointers around to spare a few bytes of memory. Fixes T2025.
Diffstat (limited to 'src/lib/evas/canvas')
-rw-r--r--src/lib/evas/canvas/evas_object_main.c2
-rw-r--r--src/lib/evas/canvas/evas_render.c11
2 files changed, 6 insertions, 7 deletions
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 7c2ea944bd..65ed1893bb 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -28,7 +28,7 @@ static const Evas_Object_Map_Data default_map = {
28}; 28};
29static const Evas_Object_Protected_State default_state = { 29static const Evas_Object_Protected_State default_state = {
30 NULL, { 0, 0, 0, 0 }, 30 NULL, { 0, 0, 0, 0 },
31 { { NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, EINA_FALSE, EINA_FALSE } }, 31 { { 0, 0, 0, 0, 0, 0, 0, 0, EINA_FALSE, EINA_FALSE } },
32 { 255, 255, 255, 255 }, 32 { 255, 255, 255, 255 },
33 1.0, 0, EVAS_RENDER_BLEND, EINA_FALSE, EINA_FALSE, EINA_FALSE, EINA_FALSE, EINA_FALSE, EINA_FALSE 33 1.0, 0, EVAS_RENDER_BLEND, EINA_FALSE, EINA_FALSE, EINA_FALSE, EINA_FALSE, EINA_FALSE, EINA_FALSE
34}; 34};
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index 47f26cdaa6..18560bf583 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -1534,8 +1534,7 @@ evas_render_mapped(Evas_Public_Data *e, Evas_Object *eo_obj,
1534 if (_evas_render_object_is_mask(obj->cur->clipper)) 1534 if (_evas_render_object_is_mask(obj->cur->clipper))
1535 { 1535 {
1536 // This path can be hit when we're multiplying masks on top of each other... 1536 // This path can be hit when we're multiplying masks on top of each other...
1537 Evas_Object_Protected_Data *mask = 1537 Evas_Object_Protected_Data *mask = obj->cur->clipper;
1538 (Evas_Object_Protected_Data *) obj->cur->clipper;
1539 if (mask->mask->redraw || !mask->mask->surface) 1538 if (mask->mask->redraw || !mask->mask->surface)
1540 evas_render_mask_subrender(obj->layer->evas, mask, NULL); 1539 evas_render_mask_subrender(obj->layer->evas, mask, NULL);
1541 1540
@@ -2287,10 +2286,10 @@ evas_render_updates_internal(Evas *eo_e,
2287 2286
2288 /* Clipper masks */ 2287 /* Clipper masks */
2289 if (_evas_render_object_is_mask(obj->cur->clipper)) 2288 if (_evas_render_object_is_mask(obj->cur->clipper))
2290 mask = (Evas_Object_Protected_Data *) obj->cur->clipper; // main object clipped by this mask 2289 mask = obj->cur->clipper; // main object clipped by this mask
2291 else if (obj->cur->cache.clip.mask) 2290 else if (obj->clip.mask)
2292 mask = (Evas_Object_Protected_Data *) obj->cur->cache.clip.mask; // propagated clip 2291 mask = obj->clip.mask; // propagated clip
2293 prev_mask = (Evas_Object_Protected_Data *) obj->cur->cache.clip.prev_mask; 2292 prev_mask = obj->clip.prev_mask;
2294 2293
2295 if (mask) 2294 if (mask)
2296 { 2295 {