From ad9e13ea5657c845491cad7ba627dd93717c7d1b Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Thu, 30 Aug 2018 13:25:05 +0900 Subject: [PATCH] evas-software-x11: Remove cserve2 support Summary: ref T7226 Depends on D6928 Reviewers: raster, cedric, zmike, Hermet Reviewed By: Hermet Subscribers: #reviewers, #committers Tags: #efl Maniphest Tasks: T7226 Differential Revision: https://phab.enlightenment.org/D6929 --- .../evas/engines/software_x11/evas_engine.c | 8 -- .../evas/engines/software_x11/evas_x_egl.c | 3 - .../engines/software_x11/evas_xlib_outbuf.c | 111 ------------------ .../engines/software_x11/evas_xlib_swapbuf.c | 40 +------ 4 files changed, 1 insertion(+), 161 deletions(-) diff --git a/src/modules/evas/engines/software_x11/evas_engine.c b/src/modules/evas/engines/software_x11/evas_engine.c index 59a6defed2..211cd84fdd 100644 --- a/src/modules/evas/engines/software_x11/evas_engine.c +++ b/src/modules/evas/engines/software_x11/evas_engine.c @@ -1,8 +1,5 @@ #include "evas_common_private.h" #include "evas_private.h" -#ifdef EVAS_CSERVE2 -#include "evas_cs2_private.h" -#endif #include "Evas_Engine_Software_X11.h" #include "evas_engine.h" @@ -486,11 +483,6 @@ eng_image_native_set(void *engine, void *image, void *native) im->native.func.free(im); } -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get() && evas_cache2_image_cached(ie)) - evas_cache2_image_close(ie); - else -#endif evas_cache_image_drop(ie); ie = ie2; diff --git a/src/modules/evas/engines/software_x11/evas_x_egl.c b/src/modules/evas/engines/software_x11/evas_x_egl.c index 9b2cde3ac9..3fc3b25f7c 100644 --- a/src/modules/evas/engines/software_x11/evas_x_egl.c +++ b/src/modules/evas/engines/software_x11/evas_x_egl.c @@ -2,9 +2,6 @@ # include #endif -#ifdef EVAS_CSERVE2 -#include "evas_cs2_private.h" -#endif #include "evas_common_private.h" #include "evas_macros.h" diff --git a/src/modules/evas/engines/software_x11/evas_xlib_outbuf.c b/src/modules/evas/engines/software_x11/evas_xlib_outbuf.c index e390ca9da3..0a0e7ac0c4 100644 --- a/src/modules/evas/engines/software_x11/evas_xlib_outbuf.c +++ b/src/modules/evas/engines/software_x11/evas_xlib_outbuf.c @@ -5,9 +5,6 @@ #include #include -#ifdef EVAS_CSERVE2 -#include "evas_cs2_private.h" -#endif #include "evas_common_private.h" #include "evas_macros.h" #include "evas_xlib_outbuf.h" @@ -177,13 +174,6 @@ evas_software_xlib_outbuf_free(Outbuf *buf) im = buf->priv.pending_writes->data; buf->priv.pending_writes = eina_list_remove_list(buf->priv.pending_writes, buf->priv.pending_writes); obr = im->extended_info; -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - { - evas_cache2_image_close(&im->cache_entry); - } - else -#endif evas_cache_image_drop(&im->cache_entry); if (obr->xob) _unfind_xob(obr->xob, 0); if (obr->mxob) _unfind_xob(obr->mxob, 0); @@ -467,16 +457,6 @@ evas_software_xlib_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w eina_spinlock_release(&(buf->priv.lock)); return NULL; } -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - { - im = (RGBA_Image *)evas_cache2_image_data(evas_common_image_cache2_get(), - buf->w, buf->h, - (DATA32 *)evas_software_xlib_x_output_buffer_data(obr->xob, &bpl), - alpha, EVAS_COLORSPACE_ARGB8888); - } - else -#endif im = (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(), buf->w, buf->h, (DATA32 *)evas_software_xlib_x_output_buffer_data(obr->xob, &bpl), @@ -499,11 +479,6 @@ evas_software_xlib_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w } else { -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - im = (RGBA_Image *)evas_cache2_image_empty(evas_common_image_cache2_get()); - else -#endif im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get()); if (!im) { @@ -512,11 +487,6 @@ evas_software_xlib_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w return NULL; } im->cache_entry.flags.alpha |= alpha ? 1 : 0; -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - evas_cache2_image_surface_alloc(&im->cache_entry, buf->w, buf->h); - else -#endif evas_cache_image_surface_alloc(&im->cache_entry, buf->w, buf->h); im->extended_info = obr; if ((buf->rot == 0) || (buf->rot == 180)) @@ -529,13 +499,6 @@ evas_software_xlib_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w NULL); if (!obr->xob) { -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - { - evas_cache2_image_close(&im->cache_entry); - } - else -#endif evas_cache_image_drop(&im->cache_entry); free(obr); eina_spinlock_release(&(buf->priv.lock)); @@ -558,13 +521,6 @@ evas_software_xlib_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w NULL); if (!obr->xob) { -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - { - evas_cache2_image_close(&im->cache_entry); - } - else -#endif evas_cache_image_drop(&im->cache_entry); free(obr); eina_spinlock_release(&(buf->priv.lock)); @@ -633,14 +589,6 @@ evas_software_xlib_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w eina_spinlock_release(&(buf->priv.lock)); return NULL; } -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - im = (RGBA_Image *)evas_cache2_image_data(evas_common_image_cache2_get(), - w, h, - (DATA32 *)evas_software_xlib_x_output_buffer_data(obr->xob, &bpl), - alpha, EVAS_COLORSPACE_ARGB8888); - else -#endif im = (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(), w, h, (DATA32 *)evas_software_xlib_x_output_buffer_data(obr->xob, &bpl), @@ -662,11 +610,6 @@ evas_software_xlib_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w } else { -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - im = (RGBA_Image *)evas_cache2_image_empty(evas_common_image_cache2_get()); - else -#endif im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get()); if (!im) { @@ -677,11 +620,6 @@ evas_software_xlib_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w im->cache_entry.w = w; im->cache_entry.h = h; im->cache_entry.flags.alpha |= alpha ? 1 : 0; -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - evas_cache2_image_surface_alloc(&im->cache_entry, w, h); - else -#endif evas_cache_image_surface_alloc(&im->cache_entry, w, h); im->extended_info = obr; if ((buf->rot == 0) || (buf->rot == 180)) @@ -694,13 +632,6 @@ evas_software_xlib_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w NULL); if (!obr->xob) { -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - { - evas_cache2_image_close(&im->cache_entry); - } - else -#endif evas_cache_image_drop(&im->cache_entry); free(obr); eina_spinlock_release(&(buf->priv.lock)); @@ -723,13 +654,6 @@ evas_software_xlib_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w NULL); if (!obr->xob) { -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - { - evas_cache2_image_close(&im->cache_entry); - } - else -#endif evas_cache_image_drop(&im->cache_entry); free(obr); eina_spinlock_release(&(buf->priv.lock)); @@ -861,13 +785,6 @@ evas_software_xlib_outbuf_flush(Outbuf *buf, Tilebuf_Rect *surface_damage EINA_U eina_list_remove_list(buf->priv.prev_pending_writes, buf->priv.prev_pending_writes); obr = im->extended_info; -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - { - evas_cache2_image_close(&im->cache_entry); - } - else -#endif evas_cache_image_drop(&im->cache_entry); if (obr->xob) _unfind_xob(obr->xob, 0); if (obr->mxob) _unfind_xob(obr->mxob, 0); @@ -905,24 +822,10 @@ evas_software_xlib_outbuf_flush(Outbuf *buf, Tilebuf_Rect *surface_damage EINA_U im = eina_list_data_get(buf->priv.pending_writes); buf->priv.pending_writes = eina_list_remove_list(buf->priv.pending_writes, buf->priv.pending_writes); obr = im->extended_info; -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - { - evas_cache2_image_close(&im->cache_entry); - } - else -#endif evas_cache_image_drop(&im->cache_entry); if (obr->xob) _unfind_xob(obr->xob, 0); if (obr->mxob) _unfind_xob(obr->mxob, 0); free(obr); -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - { - evas_cache2_image_close(&im->cache_entry); - } - else -#endif evas_cache_image_drop(&im->cache_entry); } #endif @@ -956,13 +859,6 @@ evas_software_xlib_outbuf_idle_flush(Outbuf *buf) SHMPOOL_UNLOCK(); } free(obr); -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - { - evas_cache2_image_close(&im->cache_entry); - } - else -#endif evas_cache_image_drop(&im->cache_entry); } else @@ -978,13 +874,6 @@ evas_software_xlib_outbuf_idle_flush(Outbuf *buf) eina_list_remove_list(buf->priv.prev_pending_writes, buf->priv.prev_pending_writes); obr = im->extended_info; -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - { - evas_cache2_image_close(&im->cache_entry); - } - else -#endif evas_cache_image_drop(&im->cache_entry); if (obr->xob) _unfind_xob(obr->xob, 0); if (obr->mxob) _unfind_xob(obr->mxob, 0); diff --git a/src/modules/evas/engines/software_x11/evas_xlib_swapbuf.c b/src/modules/evas/engines/software_x11/evas_xlib_swapbuf.c index 9b04a949d6..0e1f6b25e2 100644 --- a/src/modules/evas/engines/software_x11/evas_xlib_swapbuf.c +++ b/src/modules/evas/engines/software_x11/evas_xlib_swapbuf.c @@ -5,9 +5,6 @@ #include #include -#ifdef EVAS_CSERVE2 -#include "evas_cs2_private.h" -#endif #include "evas_common_private.h" #include "evas_macros.h" @@ -244,14 +241,6 @@ evas_software_xlib_swapbuf_new_region_for_update(Outbuf *buf, int x, int y, int data = evas_xlib_swapper_buffer_map(buf->priv.swapper, &bpl, &(ww), &(hh)); // To take stride into account, we do use bpl as the real image width, but return the real useful one. -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - im = (RGBA_Image *)evas_cache2_image_data(evas_common_image_cache2_get(), - bpl / bpp, hh, data, - buf->priv.destination_alpha, - EVAS_COLORSPACE_ARGB8888); - else -#endif im = (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(), bpl / bpp, hh, data, buf->priv.destination_alpha, @@ -262,11 +251,6 @@ evas_software_xlib_swapbuf_new_region_for_update(Outbuf *buf, int x, int y, int rect = eina_rectangle_new(x, y, w, h); if (!eina_array_push(&buf->priv.onebuf_regions, rect)) { -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - evas_cache2_image_close(&im->cache_entry); - else -#endif evas_cache_image_drop(&im->cache_entry); eina_rectangle_free(rect); return NULL; @@ -286,11 +270,6 @@ evas_software_xlib_swapbuf_new_region_for_update(Outbuf *buf, int x, int y, int rect = eina_rectangle_new(x, y, w, h); if (!rect) return NULL; -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - im = (RGBA_Image *)evas_cache2_image_empty(evas_common_image_cache2_get()); - else -#endif im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get()); if (!im) { @@ -298,11 +277,6 @@ evas_software_xlib_swapbuf_new_region_for_update(Outbuf *buf, int x, int y, int return NULL; } im->cache_entry.flags.alpha |= buf->priv.destination_alpha ? 1 : 0; -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - evas_cache2_image_surface_alloc(&im->cache_entry, w, h); - else -#endif evas_cache_image_surface_alloc(&im->cache_entry, w, h); im->extended_info = rect; buf->priv.pending_writes = eina_list_append(buf->priv.pending_writes, im); @@ -343,14 +317,7 @@ evas_software_xlib_swapbuf_flush(Outbuf *buf, Tilebuf_Rect *surface_damage EINA_ im = buf->priv.onebuf; buf->priv.onebuf = NULL; if (im) - { -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - evas_cache2_image_close(&im->cache_entry); - else -#endif - evas_cache_image_drop(&im->cache_entry); - } + evas_cache_image_drop(&im->cache_entry); } else { @@ -398,11 +365,6 @@ evas_software_xlib_swapbuf_flush(Outbuf *buf, Tilebuf_Rect *surface_damage EINA_ result[i].h = w; } eina_rectangle_free(rect); -#ifdef EVAS_CSERVE2 - if (evas_cserve2_use_get()) - evas_cache2_image_close(&im->cache_entry); - else -#endif evas_cache_image_drop(&im->cache_entry); i++; }