aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2014-11-19 19:19:56 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2014-11-19 19:19:56 +0900
commit64238ca9f18e8b580da7d77559e52c539b2c095d (patch)
treeb40ef4306c2efe5dbe680b05335ab0952cb50d8b
parentEvas: Set image load_error after load (diff)
downloadefl-64238ca9f18e8b580da7d77559e52c539b2c095d.tar.gz
Revert "Evas: Set image load_error after load"
Oops, I didn't test this enough. This causes some problems with E's pager for instance. This reverts commit 42d2f8a12b4706b79e7cf16162d34f259bdc23d4.
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_image.c35
1 files changed, 14 insertions, 21 deletions
diff --git a/src/modules/evas/engines/gl_common/evas_gl_image.c b/src/modules/evas/engines/gl_common/evas_gl_image.c
index 4faf6b2cd2..9e852bbced 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_image.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_image.c
@@ -762,7 +762,6 @@ void
evas_gl_common_image_update(Evas_Engine_GL_Context *gc, Evas_GL_Image *im)
{
Image_Entry *ie;
-
if (!im->im) return;
ie = &im->im->cache_entry;
evas_gl_common_image_alloc_ensure(im);
@@ -809,37 +808,33 @@ evas_gl_common_image_update(Evas_Engine_GL_Context *gc, Evas_GL_Image *im)
#ifdef EVAS_CSERVE2
if (evas_cache2_image_cached(ie))
{
- ie->load_error = evas_cache2_image_load_data(ie);
- if (ie->load_error == EVAS_LOAD_ERROR_NONE)
- evas_gl_common_texture_update(im->tex, im->im);
+ evas_cache2_image_load_data(ie);
+ evas_gl_common_texture_update(im->tex, im->im);
evas_cache2_image_unload_data(ie);
}
else
#endif
{
- ie->load_error = evas_cache_image_load_data(ie);
- if (ie->load_error == EVAS_LOAD_ERROR_NONE)
- evas_gl_common_texture_update(im->tex, im->im);
+ evas_cache_image_load_data(ie);
+ evas_gl_common_texture_update(im->tex, im->im);
evas_cache_image_unload_data(ie);
}
ie->flags.updated_data = 0;
}
- else if ((!im->tex) && (ie->load_error == EVAS_LOAD_ERROR_NONE))
+ if (!im->tex)
{
#ifdef EVAS_CSERVE2
if (evas_cache2_image_cached(ie))
{
- ie->load_error = evas_cache2_image_load_data(ie);
- if (ie->load_error == EVAS_LOAD_ERROR_NONE)
- im->tex = evas_gl_common_texture_new(gc, im->im);
+ evas_cache2_image_load_data(ie);
+ im->tex = evas_gl_common_texture_new(gc, im->im);
evas_cache2_image_unload_data(ie);
}
else
#endif
{
- ie->load_error = evas_cache_image_load_data(ie);
- if (ie->load_error == EVAS_LOAD_ERROR_NONE)
- im->tex = evas_gl_common_texture_new(gc, im->im);
+ evas_cache_image_load_data(ie);
+ im->tex = evas_gl_common_texture_new(gc, im->im);
evas_cache_image_unload_data(ie);
}
}
@@ -849,16 +844,14 @@ evas_gl_common_image_update(Evas_Engine_GL_Context *gc, Evas_GL_Image *im)
case EVAS_COLORSPACE_ETC1_ALPHA:
if ((im->tex) && (im->dirty))
{
- ie->load_error = evas_cache_image_load_data(ie);
- if (ie->load_error == EVAS_LOAD_ERROR_NONE)
- evas_gl_common_texture_rgb_a_pair_update(im->tex, im->im);
+ evas_cache_image_load_data(ie);
+ evas_gl_common_texture_rgb_a_pair_update(im->tex, im->im);
evas_cache_image_unload_data(ie);
}
- else if ((!im->tex) && (ie->load_error == EVAS_LOAD_ERROR_NONE))
+ else if ((!im->tex))
{
- ie->load_error = evas_cache_image_load_data(ie);
- if (ie->load_error == EVAS_LOAD_ERROR_NONE)
- im->tex = evas_gl_common_texture_rgb_a_pair_new(gc, im->im);
+ evas_cache_image_load_data(ie);
+ im->tex = evas_gl_common_texture_rgb_a_pair_new(gc, im->im);
evas_cache_image_unload_data(ie);
}
im->dirty = 0;