enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

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
This commit is contained in:
Vincent Torri 2021-10-26 14:52:53 +01:00 committed by Carsten Haitzler (Rasterman)
parent 247c2de1b3
commit 7dcaab26cf
2 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;

19
src/modules/evas/engines/software_generic/evas_engine.c
View File

@ -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);
}