summaryrefslogtreecommitdiff
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
parent42d2f8a12b4706b79e7cf16162d34f259bdc23d4 (diff)
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
762evas_gl_common_image_update(Evas_Engine_GL_Context *gc, Evas_GL_Image *im) 762evas_gl_common_image_update(Evas_Engine_GL_Context *gc, Evas_GL_Image *im)
763{ 763{
764 Image_Entry *ie; 764 Image_Entry *ie;
765
766 if (!im->im) return; 765 if (!im->im) return;
767 ie = &im->im->cache_entry; 766 ie = &im->im->cache_entry;
768 evas_gl_common_image_alloc_ensure(im); 767 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)
809#ifdef EVAS_CSERVE2 808#ifdef EVAS_CSERVE2
810 if (evas_cache2_image_cached(ie)) 809 if (evas_cache2_image_cached(ie))
811 { 810 {
812 ie->load_error = evas_cache2_image_load_data(ie); 811 evas_cache2_image_load_data(ie);
813 if (ie->load_error == EVAS_LOAD_ERROR_NONE) 812 evas_gl_common_texture_update(im->tex, im->im);
814 evas_gl_common_texture_update(im->tex, im->im);
815 evas_cache2_image_unload_data(ie); 813 evas_cache2_image_unload_data(ie);
816 } 814 }
817 else 815 else
818#endif 816#endif
819 { 817 {
820 ie->load_error = evas_cache_image_load_data(ie); 818 evas_cache_image_load_data(ie);
821 if (ie->load_error == EVAS_LOAD_ERROR_NONE) 819 evas_gl_common_texture_update(im->tex, im->im);
822 evas_gl_common_texture_update(im->tex, im->im);
823 evas_cache_image_unload_data(ie); 820 evas_cache_image_unload_data(ie);
824 } 821 }
825 ie->flags.updated_data = 0; 822 ie->flags.updated_data = 0;
826 } 823 }
827 else if ((!im->tex) && (ie->load_error == EVAS_LOAD_ERROR_NONE)) 824 if (!im->tex)
828 { 825 {
829#ifdef EVAS_CSERVE2 826#ifdef EVAS_CSERVE2
830 if (evas_cache2_image_cached(ie)) 827 if (evas_cache2_image_cached(ie))
831 { 828 {
832 ie->load_error = evas_cache2_image_load_data(ie); 829 evas_cache2_image_load_data(ie);
833 if (ie->load_error == EVAS_LOAD_ERROR_NONE) 830 im->tex = evas_gl_common_texture_new(gc, im->im);
834 im->tex = evas_gl_common_texture_new(gc, im->im);
835 evas_cache2_image_unload_data(ie); 831 evas_cache2_image_unload_data(ie);
836 } 832 }
837 else 833 else
838#endif 834#endif
839 { 835 {
840 ie->load_error = evas_cache_image_load_data(ie); 836 evas_cache_image_load_data(ie);
841 if (ie->load_error == EVAS_LOAD_ERROR_NONE) 837 im->tex = evas_gl_common_texture_new(gc, im->im);
842 im->tex = evas_gl_common_texture_new(gc, im->im);
843 evas_cache_image_unload_data(ie); 838 evas_cache_image_unload_data(ie);
844 } 839 }
845 } 840 }
@@ -849,16 +844,14 @@ evas_gl_common_image_update(Evas_Engine_GL_Context *gc, Evas_GL_Image *im)
849 case EVAS_COLORSPACE_ETC1_ALPHA: 844 case EVAS_COLORSPACE_ETC1_ALPHA:
850 if ((im->tex) && (im->dirty)) 845 if ((im->tex) && (im->dirty))
851 { 846 {
852 ie->load_error = evas_cache_image_load_data(ie); 847 evas_cache_image_load_data(ie);
853 if (ie->load_error == EVAS_LOAD_ERROR_NONE) 848 evas_gl_common_texture_rgb_a_pair_update(im->tex, im->im);
854 evas_gl_common_texture_rgb_a_pair_update(im->tex, im->im);
855 evas_cache_image_unload_data(ie); 849 evas_cache_image_unload_data(ie);
856 } 850 }
857 else if ((!im->tex) && (ie->load_error == EVAS_LOAD_ERROR_NONE)) 851 else if ((!im->tex))
858 { 852 {
859 ie->load_error = evas_cache_image_load_data(ie); 853 evas_cache_image_load_data(ie);
860 if (ie->load_error == EVAS_LOAD_ERROR_NONE) 854 im->tex = evas_gl_common_texture_rgb_a_pair_new(gc, im->im);
861 im->tex = evas_gl_common_texture_rgb_a_pair_new(gc, im->im);
862 evas_cache_image_unload_data(ie); 855 evas_cache_image_unload_data(ie);
863 } 856 }
864 im->dirty = 0; 857 im->dirty = 0;