summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWonsik Jung <sidein@samsung.com>2015-05-10 15:04:17 +0900
committerWonsik Jung <sidein@samsung.com>2015-05-10 15:04:17 +0900
commit4f98c37a14e4738a0fdd3424e50b38b302a8da35 (patch)
treebc19aa63ee3d8311a5b1caee705a8db2f7c30284
parentbe57a84100d515b775a903664061e02cd115ae6b (diff)
downloadefl-4f98c37a14e4738a0fdd3424e50b38b302a8da35.tar.gz
Fix to call evas gl init when elm_glview/evas gl is not used.
@fix - Although elm_glview/evas gl is not used, evgl_engine_init() is called. Because eng_gl_get_pixels_set is always called when evas object image is rendering. To fix it, the checked code with pixel_getter function is added Change-Id: I60461dcce3d2dcfae857c9870bf656c3aa9b0b65
-rw-r--r--src/lib/evas/canvas/evas_object_image.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 9ec344a15d..8e35a7d913 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -2780,7 +2780,7 @@ evas_process_dirty_pixels(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj,
(!obj->map->cur.map))
) && (!direct_force_off) )
{
- if (ENFN->gl_get_pixels_set)
+ if ((ENFN->gl_get_pixels_set) && (o->pixels->func.get_pixels))
ENFN->gl_get_pixels_set(output, o->pixels->func.get_pixels, o->pixels->func.get_pixels_data, eo_obj);
o->direct_render = EINA_TRUE;
}
@@ -2921,7 +2921,7 @@ evas_object_image_render(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, v
ENFN->context_render_op_set(output, context, obj->cur->render_op);
// Clear out the pixel get stuff..
- if (ENFN->gl_get_pixels_set)
+ if ((ENFN->gl_get_pixels_set) && (o->pixels->func.get_pixels))
{
ENFN->gl_get_pixels_set(output, NULL, NULL, NULL);
}