From: Chris Micheal <cp.michael@samsung.com>
Date: Thu, 30 Aug 2018 04:32:51 +0000 (+0900)
Subject: evas-gl-generic: Remove cserve2 support
X-Git-Tag: submit/sandbox/upgrade/efl120/20180919.042345~75
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=471b9d0735c579683b98c8fe7069e73855070674;p=platform%2Fupstream%2Fefl.git

evas-gl-generic: Remove cserve2 support

ref T7226

Depends on D6925
---

diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index f81e313..bf01344 100755
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -18,10 +18,6 @@
 #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"
 
@@ -276,14 +272,7 @@ eng_image_alpha_set(void *engine, void *image, int has_alpha)
         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,
@@ -972,12 +961,7 @@ eng_image_data_get(void *engine, void *image, int to_write, DATA32 **image_data,
           }
      }
 
-#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)
@@ -1285,12 +1269,7 @@ eng_image_data_preload_request(void *engine EINA_UNUSED, void *image, const Eo *
    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
@@ -1305,12 +1284,7 @@ eng_image_data_preload_cancel(void *engine EINA_UNUSED, void *image, const Eo *t
    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);
 }
 
@@ -2452,12 +2426,7 @@ eng_pixel_alpha_get(void *image, int x, int y, DATA8 *alpha, int src_region_x, i
        {
           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);