diff options
author | Vincent Torri <vincent.torri@gmail.com> | 2021-10-26 14:52:53 +0100 |
---|---|---|
committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2021-10-26 14:52:53 +0100 |
commit | 7dcaab26cf6643fae0401c38b394d821370681fd (patch) | |
tree | 5e6341b898939a3d72331c4a8acc6fa8077f91a2 /src | |
parent | 247c2de1b3d12f4fe3db4e435e2479e89fb86be8 (diff) | |
download | efl-7dcaab26cf6643fae0401c38b394d821370681fd.tar.gz |
Evas engines: remove last bits of evas_cserve2
Reviewers: raster
Reviewed By: raster
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D12302
Diffstat (limited to 'src')
-rw-r--r-- | src/modules/evas/engines/gl_common/evas_gl_image.c | 20 | ||||
-rw-r--r-- | src/modules/evas/engines/software_generic/evas_engine.c | 19 |
2 files changed, 0 insertions, 39 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 78a3fe09b1..f52691f6c5 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_image.c +++ b/src/modules/evas/engines/gl_common/evas_gl_image.c @@ -293,26 +293,6 @@ evas_gl_common_image_load(Evas_Engine_GL_Context *gc, const char *file, const ch { RGBA_Image *im_im; -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - { - im_im = (RGBA_Image *) evas_cache2_image_open - (evas_common_image_cache2_get(), file, key, lo, error); - if (im_im) - { - *error = evas_cache2_image_open_wait(&im_im->cache_entry); - if ((*error != EVAS_LOAD_ERROR_NONE) - && im_im->cache_entry.animated.animated) - { - evas_cache2_image_close(&im_im->cache_entry); - im_im = NULL; - } - else - return evas_gl_common_image_new_from_rgbaimage(gc, im_im, lo, error); - } - } -#endif - im_im = evas_common_load_image_from_file(file, key, lo, error); if (!im_im) return NULL; diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c index 78d8172b93..4d5e104769 100644 --- a/src/modules/evas/engines/software_generic/evas_engine.c +++ b/src/modules/evas/engines/software_generic/evas_engine.c @@ -1208,25 +1208,6 @@ static void * eng_image_load(void *data EINA_UNUSED, const char *file, const char *key, int *error, Evas_Image_Load_Opts *lo) { *error = EVAS_LOAD_ERROR_NONE; -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - { - Image_Entry *ie; - ie = evas_cache2_image_open(evas_common_image_cache2_get(), - file, key, lo, error); - if (ie) - { - *error = evas_cache2_image_open_wait(ie); - if ((*error != EVAS_LOAD_ERROR_NONE) && ie->animated.animated) - { - evas_cache2_image_close(ie); - goto use_local_cache; - } - } - return ie; - } -use_local_cache: -#endif return evas_common_load_image_from_file(file, key, lo, error); } |