#include "evas_gl_private.h"
-#ifdef EVAS_CSERVE2
-#include "evas_cs2_private.h"
-#endif
-
void
evas_gl_common_image_alloc_ensure(Evas_GL_Image *im)
{
if (!im->im) return;
-#ifdef EVAS_CSERVE2
- if (evas_cache2_image_cached(&im->im->cache_entry))
- im->im = (RGBA_Image *)evas_cache2_image_size_set(&im->im->cache_entry,
- im->w, im->h);
- else
-#endif
- im->im = (RGBA_Image *)evas_cache_image_size_set(&im->im->cache_entry,
- im->w, im->h);
+ im->im = (RGBA_Image *)evas_cache_image_size_set(&im->im->cache_entry,
+ im->w, im->h);
}
EAPI void
EINA_LIST_FOREACH(gc->shared->images, l, im)
{
if (im->im)
- {
-#ifdef EVAS_CSERVE2
- if (evas_cache2_image_cached(&im->im->cache_entry))
- evas_cache2_image_unload_data(&im->im->cache_entry);
- else
-#endif
- evas_cache_image_unload_data(&im->im->cache_entry);
- }
+ evas_cache_image_unload_data(&im->im->cache_entry);
if (im->tex)
{
if (!im->tex->pt->dyn.img)
im = calloc(1, sizeof(Evas_GL_Image));
if (!im)
{
-#ifdef EVAS_CSERVE2
- if (evas_cache2_image_cached(&im_im->cache_entry))
- evas_cache2_image_close(&(im_im->cache_entry));
- else
-#endif
- evas_cache_image_drop(&(im_im->cache_entry));
+ evas_cache_image_drop(&(im_im->cache_entry));
if (error) *error = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
return NULL;
}
{
RGBA_Image *im_im;
-#ifdef EVAS_CSERVE2
- if (evas_cserve2_use_get() && !eina_file_virtual(f))
- {
- im_im = (RGBA_Image *) evas_cache2_image_open
- (evas_common_image_cache2_get(), eina_file_filename_get(f), 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_mmap(f, key, lo, error);
if (!im_im) return NULL;
im->alpha = alpha;
if (!im->im) return im;
evas_gl_common_image_alloc_ensure(im);
-#ifdef EVAS_CSERVE2
- if (evas_cache2_image_cached(&im->im->cache_entry))
- evas_cache2_image_load_data(&im->im->cache_entry);
- else
-#endif
- evas_cache_image_load_data(&im->im->cache_entry);
+ evas_cache_image_load_data(&im->im->cache_entry);
im->im->cache_entry.flags.alpha = alpha ? 1 : 0;
if (im->tex) evas_gl_common_texture_free(im->tex, EINA_TRUE);
}
if (im->im)
{
-#ifdef EVAS_CSERVE2
- if (evas_cache2_image_cached(&im->im->cache_entry))
- evas_cache2_image_close(&im->im->cache_entry);
- else
-#endif
- evas_cache_image_drop(&im->im->cache_entry);
+ evas_cache_image_drop(&im->im->cache_entry);
im->im = NULL;
}
if (im->tex)
{
if (im->im)
{
-#ifdef EVAS_CSERVE2
- if (!evas_cache2_image_cached(&im->im->cache_entry))
- evas_cache2_image_close(&im->im->cache_entry);
- else
-#endif
- evas_cache_image_drop(&im->im->cache_entry);
+ evas_cache_image_drop(&im->im->cache_entry);
im->im = NULL;
}
if (im->tex)
}
if (im->im)
{
-#ifdef EVAS_CSERVE2
- if (evas_cache2_image_cached(&im->im->cache_entry))
- evas_cache2_image_close(&im->im->cache_entry);
- else
-#endif
- evas_cache_image_drop(&im->im->cache_entry);
+ evas_cache_image_drop(&im->im->cache_entry);
im->im = NULL;
}
if (im->tex)
{
if (im->im)
{
-#ifdef EVAS_CSERVE2
- if (evas_cache2_image_cached(&im->im->cache_entry))
- evas_cache2_image_close(&im->im->cache_entry);
- else
-#endif
- evas_cache_image_drop(&im->im->cache_entry);
+ evas_cache_image_drop(&im->im->cache_entry);
im->im = NULL;
}
if (im->tex)
}
if (im->tex) evas_gl_common_texture_free(im->tex, EINA_TRUE);
if (im->im)
- {
-#ifdef EVAS_CSERVE2
- if (evas_cache2_image_cached(&im->im->cache_entry))
- evas_cache2_image_close(&im->im->cache_entry);
- else
-#endif
- evas_cache_image_drop(&im->im->cache_entry);
- }
+ evas_cache_image_drop(&im->im->cache_entry);
free(im);
}
if (im->im)
{
evas_gl_common_image_alloc_ensure(im);
-#ifdef EVAS_CSERVE2
- if (evas_cache2_image_cached(&im->im->cache_entry))
- im->im = (RGBA_Image *)evas_cache2_image_dirty(&im->im->cache_entry, x, y, w, h);
- else
-#endif
- im->im = (RGBA_Image *)evas_cache_image_dirty(&im->im->cache_entry, x, y, w, h);
+ im->im = (RGBA_Image *)evas_cache_image_dirty(&im->im->cache_entry, x, y, w, h);
}
im->dirty = 1;
}
if ((im->tex) &&
((im->dirty) || (ie->animated.animated) || (ie->flags.updated_data)))
{
-#ifdef EVAS_CSERVE2
- if (evas_cache2_image_cached(ie))
- {
- evas_cache2_image_load_data(ie);
- evas_gl_common_texture_update(im->tex, im->im);
- evas_cache2_image_unload_data(ie);
- }
- else
-#endif
- {
- evas_cache_image_load_data(ie);
- evas_gl_common_texture_update(im->tex, im->im);
- evas_cache_image_unload_data(ie);
- }
+ evas_cache_image_load_data(ie);
+ evas_gl_common_texture_update(im->tex, im->im);
+ evas_cache_image_unload_data(ie);
}
else if (!im->tex && !ie->load_error)
{
-#ifdef EVAS_CSERVE2
- if (evas_cache2_image_cached(ie))
- {
- evas_cache2_image_load_data(ie);
- im->tex = evas_gl_common_texture_new(gc, im->im, im->disable_atlas);
- evas_cache2_image_unload_data(ie);
- }
- else
-#endif
- {
- evas_cache_image_load_data(ie);
- im->tex = evas_gl_common_texture_new(gc, im->im, im->disable_atlas);
- evas_cache_image_unload_data(ie);
- }
+ evas_cache_image_load_data(ie);
+ im->tex = evas_gl_common_texture_new(gc, im->im, im->disable_atlas);
+ evas_cache_image_unload_data(ie);
}
ie->flags.updated_data = EINA_FALSE;
im->dirty = 0;
#include "evas_gl_private.h"
-#ifdef EVAS_CSERVE2
-#include "evas_cs2_private.h"
-#endif
-
static Eina_Thread async_loader_thread;
static Eina_Condition async_loader_cond;
static Eina_Lock async_loader_lock;
if (running) evas_gl_preload_render_lock(tmp_cb, tmp_data);
evas_gl_common_texture_free(current->tex, EINA_FALSE);
-#ifdef EVAS_CSERVE2
- if (evas_cache2_image_cached(¤t->im->cache_entry))
- evas_cache2_image_close(¤t->im->cache_entry);
- else
-#endif
evas_cache_image_drop(¤t->im->cache_entry);
free(current);
async_loader_tex = eina_list_remove_list(async_loader_tex, l);
evas_gl_common_texture_free(async->tex, EINA_FALSE);
-#ifdef EVAS_CSERVE2
- if (evas_cache2_image_cached(&async->im->cache_entry))
- evas_cache2_image_close(&async->im->cache_entry);
- else
-#endif
- evas_cache_image_drop(&async->im->cache_entry);
+ evas_cache_image_drop(&async->im->cache_entry);
free(async);
break;
evas_gl_common_texture_free(async->tex, EINA_FALSE);
}
-#ifdef EVAS_CSERVE2
- if (evas_cache2_image_cached(&async->im->cache_entry))
- evas_cache2_image_close(&async->im->cache_entry);
- else
-#endif
evas_cache_image_drop(&async->im->cache_entry);
free(async);
}