enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

Evas: Check load_error before loading again (GL) 

This is a new attempt at avoiding reload of an image
that failed to load during async preload.

See 42d2f8a12b (reverted).

I still can't figure out why setting load_error does not
work as expected (E pager becomes blank).
This commit is contained in:
Jean-Philippe Andre 2014-11-19 19:45:04 +09:00
parent 64238ca9f1
commit f902de616e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/evas/engines/gl_common/evas_gl_image.c
View File

@ -821,7 +821,7 @@ evas_gl_common_image_update(Evas_Engine_GL_Context *gc, Evas_GL_Image *im)
}
ie->flags.updated_data = 0;
}
if (!im->tex)
else if (!im->tex && !ie->load_error)
{
#ifdef EVAS_CSERVE2
if (evas_cache2_image_cached(ie))
@ -848,7 +848,7 @@ evas_gl_common_image_update(Evas_Engine_GL_Context *gc, Evas_GL_Image *im)
evas_gl_common_texture_rgb_a_pair_update(im->tex, im->im);
evas_cache_image_unload_data(ie);
}
else if ((!im->tex))
else if (!im->tex && !ie->load_error)
{
evas_cache_image_load_data(ie);
im->tex = evas_gl_common_texture_rgb_a_pair_new(gc, im->im);