evas-canvas: Remove cserve2 support

Summary:
ref T7226

Depends on D6933

Reviewers: raster, cedric, zmike, Hermet

Reviewed By: Hermet

Subscribers: #reviewers, #committers

Tags: #efl

Maniphest Tasks: T7226

Differential Revision: https://phab.enlightenment.org/D6934

4 files changed, 1 insertions, 51 deletions

diff --git a/src/lib/evas/canvas/evas_image_private.h b/src/lib/evas/canvas/evas_image_private.h
index a5af04a1fa..d475e1cdc3 100644
--- a/src/lib/evas/canvas/evas_image_private.h
+++ b/src/lib/evas/canvas/evas_image_private.h
@@ -18,9 +18,6 @@
 #include <math.h>
 
 #include "evas_private.h"
-#ifdef EVAS_CSERVE2
-#include "../cserve2/evas_cs2_private.h"
-#endif
 #include "../common/evas_convert_color.h"
 #include "../common/evas_convert_colorspace.h"
 #include "../common/evas_convert_yuv.h"
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 9af9f016dc..12c57e360d 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -4,9 +4,6 @@
 #include "evas_common_private.h"
 #include "evas_private.h"
 //#include "evas_cs.h"
-#ifdef EVAS_CSERVE2
-#include "evas_cs2_private.h"
-#endif
 
 #include "evas_image_private.h"
 #include "evas_polygon_private.h"
@@ -70,18 +67,6 @@ evas_init(void)
 
    evas_module_init();
    EINA_SAFETY_ON_FALSE_GOTO(evas_async_events_init(), shutdown_module);
-#ifdef EVAS_CSERVE2
-   int cs2 = 0;
-   {
-      const char *env;
-      env = getenv("EVAS_CSERVE2");
-      if (env && atoi(env))
-        {
-           cs2 = evas_cserve2_init();
-           EINA_SAFETY_ON_FALSE_GOTO(cs2, shutdown_async_events);
-        }
-   }
-#endif
    _evas_preload_thread_init();
    evas_filter_init();
    evas_cache_vg_init();
@@ -102,11 +87,6 @@ evas_init(void)
  shutdown_filter:
    evas_filter_shutdown();
    _evas_preload_thread_shutdown();
-#ifdef EVAS_CSERVE2
-   if (cs2) evas_cserve2_shutdown();
-shutdown_async_events:
-   evas_async_events_shutdown();
-#endif
 shutdown_module:
    evas_module_shutdown();
 shutdown_ecore:
@@ -145,10 +125,6 @@ evas_shutdown(void)
 
    evas_focus_shutdown();
 
-#ifdef EVAS_CSERVE2
-   if (evas_cserve2_use_get())
-     evas_cserve2_shutdown();
-#endif
    evas_cache_vg_shutdown();
 
    evas_font_path_global_clear();
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index aecff55ca6..140e10b184 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -1401,11 +1401,6 @@ _draw_image(Evas_Object_Protected_Data *obj,
                                   smooth, do_async);
    if (do_async && async_unref)
      {
-#ifdef EVAS_CSERVE2
-        if (evas_cserve2_use_get())
-          evas_cache2_image_ref((Image_Entry *)image);
-        else
-#endif
         evas_cache_image_ref((Image_Entry *)image);
 
         evas_unref_queue_image_put(obj->layer->evas, image);
@@ -1427,11 +1422,6 @@ evas_draw_image_map_async_check(Evas_Object_Protected_Data *obj,
                                       do_async);
    if (do_async && async_unref)
      {
-#ifdef EVAS_CSERVE2
-        if (evas_cserve2_use_get())
-          evas_cache2_image_ref((Image_Entry *)image);
-        else
-#endif
         evas_cache_image_ref((Image_Entry *)image);
 
         evas_unref_queue_image_put(obj->layer->evas, image);
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index 7a15b45400..17f16c769e 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -2,9 +2,6 @@
 #include "evas_private.h"
 #include <math.h>
 #include <assert.h>
-#ifdef EVAS_CSERVE2
-#include "evas_cs2_private.h"
-#endif
 
 #ifdef EVAS_RENDER_DEBUG_TIMING
 #include <sys/time.h>
@@ -2741,12 +2738,7 @@ _drop_scie_ref(const void *container EINA_UNUSED, void *data, void *fdata EINA_U
 static Eina_Bool
 _drop_image_cache_ref(const void *container EINA_UNUSED, void *data, void *fdata EINA_UNUSED)
 {
-#ifdef EVAS_CSERVE2
-   if (evas_cserve2_use_get() && evas_cache2_image_cached(data))
-     evas_cache2_image_close((Image_Entry *)data);
-   else
-#endif
-     evas_cache_image_drop((Image_Entry *)data);
+   evas_cache_image_drop((Image_Entry *)data);
 
    return EINA_TRUE;
 }
@@ -3189,11 +3181,6 @@ evas_render_updates_internal(Evas *eo_e,
    double start_time = _time_get();
 #endif
 
-#ifdef EVAS_CSERVE2
-   if (evas_cserve2_use_get())
-      evas_cserve2_dispatch();
-#endif
-
    evas_render_pre(eo_e, evas);
 
    eina_evlog("+render_calc", eo_e, 0.0, NULL);