aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/evas/canvas/evas_object_image.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2015-02-26 15:36:09 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-02-27 13:06:09 +0900
commitfab0d7f9d391fc4e85cbc021c3ea1a79323aa5bf (patch)
tree9d153b2a941a45dbce042a1d2d83b14577b79259 /src/lib/evas/canvas/evas_object_image.c
parentEvas masking: Add fast path for image-only masks in GL. (diff)
downloadefl-fab0d7f9d391fc4e85cbc021c3ea1a79323aa5bf.tar.gz
Evas masking: Simplify previous commit
Call object's function to get the private engine_data (here, the image object). Thanks Dongyeon for your patch which inspired me to do that instead of forcing pre_render.
Diffstat (limited to 'src/lib/evas/canvas/evas_object_image.c')
-rw-r--r--src/lib/evas/canvas/evas_object_image.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 2faf393578..63f777f04a 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -3541,18 +3541,6 @@ state_write:
}
}
-static inline void
-_image_mask_image_set(Evas_Object_Protected_Data *obj, Eina_Bool smooth, void *image)
-{
- if ((obj->mask->image != image) || (obj->mask->smooth_scale != smooth))
- {
- EINA_COW_WRITE_BEGIN(evas_object_mask_cow, obj->mask, Evas_Object_Mask_Data, mask)
- mask->image = image;
- mask->smooth_scale = smooth;
- EINA_COW_WRITE_END(evas_object_mask_cow, obj->mask, mask);
- }
-}
-
static void
evas_object_image_render_pre(Evas_Object *eo_obj,
Evas_Object_Protected_Data *obj,
@@ -3573,15 +3561,6 @@ evas_object_image_render_pre(Evas_Object *eo_obj,
if ((o->cur->fill.w < 1) || (o->cur->fill.h < 1)) return;
- /* plain mask images */
- if (obj->mask->is_mask && !o->cur->scene && !o->cur->source)
- {
- DBG("Setting image pointer in mask data.");
- _image_mask_image_set(obj, o->cur->smooth_scale, o->engine_data);
- }
- else
- _image_mask_image_set(obj, EINA_FALSE, NULL);
-
/* if someone is clipping this obj - go calculate the clipper */
if (obj->cur->clipper)
{