#include "Evas_Engine_GL_Generic.h"
#include "../software_generic/evas_engine.h"
-#ifdef EVAS_CSERVE2
-#include "evas_cs2_private.h"
-#endif
-
#define EVAS_GL_NO_GL_H_CHECK 1
#include "Evas_GL.h"
Evas_GL_Image *im_new;
if (!im->im->image.data)
- {
-#ifdef EVAS_CSERVE2
- if (evas_cserve2_use_get() && 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);
evas_gl_common_image_alloc_ensure(im);
im_new = evas_gl_common_image_new_from_copied_data
(im->gc, im->im->cache_entry.w, im->im->cache_entry.h,
}
}
-#ifdef EVAS_CSERVE2
- if (evas_cserve2_use_get() && evas_cache2_image_cached(&im->im->cache_entry))
- error = evas_cache2_image_load_data(&im->im->cache_entry);
- else
-#endif
- error = evas_cache_image_load_data(&im->im->cache_entry);
+ error = evas_cache_image_load_data(&im->im->cache_entry);
if (err) *err = error;
if (error != EVAS_LOAD_ERROR_NONE)
im = (RGBA_Image *)gim->im;
if (!im) return;
-#ifdef EVAS_CSERVE2
- if (evas_cserve2_use_get() && evas_cache2_image_cached(&im->cache_entry))
- evas_cache2_image_preload_data(&im->cache_entry, target, evas_gl_common_image_preload_done, gim);
- else
-#endif
- evas_cache_image_preload_data(&im->cache_entry, target, evas_gl_common_image_preload_done, gim);
+ evas_cache_image_preload_data(&im->cache_entry, target, evas_gl_common_image_preload_done, gim);
}
static void
if (!im) return;
evas_gl_common_image_preload_unwatch(gim);
-#ifdef EVAS_CSERVE2
- if (evas_cserve2_use_get() && evas_cache2_image_cached(&im->cache_entry))
- evas_cache2_image_preload_cancel(&im->cache_entry, target);
- else
-#endif
- evas_cache_image_preload_cancel(&im->cache_entry, target);
+ evas_cache_image_preload_cancel(&im->cache_entry, target);
// if (gim->tex) evas_gl_preload_target_unregister(gim->tex, (Eo*) target);
}
{
DATA32 *pixel;
-#ifdef EVAS_CSERVE2
- if (evas_cserve2_use_get() && 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);
if (!im->im->cache_entry.flags.loaded)
{
ERR("im %p has no pixels loaded yet", im);