summaryrefslogtreecommitdiff
path: root/src/modules/evas/engines
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2018-08-30 13:21:27 +0900
committerHermet Park <hermetpark@gmail.com>2018-08-30 13:21:27 +0900
commitea857a500f757a1877a8950e1ea470ee163d250b (patch)
tree5d14565202c5f2ba161d810341a9a1bafa98c905 /src/modules/evas/engines
parent7313e6973e78a41b80ff863faeb5ba544bdd5818 (diff)
evas-wayland-shm: Remove cserve2 support
Summary: ref T7226 Depends on D6923 Reviewers: raster, cedric, zmike, Hermet Reviewed By: Hermet Subscribers: #reviewers, #committers Tags: #efl Maniphest Tasks: T7226 Differential Revision: https://phab.enlightenment.org/D6924
Diffstat (limited to 'src/modules/evas/engines')
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_engine.c8
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_outbuf.c85
2 files changed, 13 insertions, 80 deletions
diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c b/src/modules/evas/engines/wayland_shm/evas_engine.c
index 4f2aea5930..6051a2d840 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.c
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.c
@@ -1,8 +1,5 @@
1#include "evas_common_private.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3#ifdef EVAS_CSERVE2
4# include "evas_cs2_private.h"
5#endif
6 3
7#include "evas_engine.h" 4#include "evas_engine.h"
8#include "../software_generic/evas_native_common.h" 5#include "../software_generic/evas_native_common.h"
@@ -252,11 +249,6 @@ eng_image_native_set(void *engine EINA_UNUSED, void *image, void *native)
252 im->native.func.free(im); 249 im->native.func.free(im);
253 } 250 }
254 251
255#ifdef EVAS_CSERVE2
256 if (evas_cserve2_use_get() && evas_cache2_image_cached(ie))
257 evas_cache2_image_close(ie);
258 else
259#endif
260 evas_cache_image_drop(ie); 252 evas_cache_image_drop(ie);
261 im = im2; 253 im = im2;
262 254
diff --git a/src/modules/evas/engines/wayland_shm/evas_outbuf.c b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
index a435fdca3c..1dd64934f3 100644
--- a/src/modules/evas/engines/wayland_shm/evas_outbuf.c
+++ b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
@@ -1,8 +1,5 @@
1#include "evas_common_private.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3#ifdef EVAS_CSERVE2
4# include "evas_cs2_private.h"
5#endif
6#include "evas_engine.h" 3#include "evas_engine.h"
7 4
8#define RED_MASK 0xff0000 5#define RED_MASK 0xff0000
@@ -57,12 +54,7 @@ _evas_outbuf_free(Outbuf *ob)
57 54
58 rect = img->extended_info; 55 rect = img->extended_info;
59 56
60#ifdef EVAS_CSERVE2 57 evas_cache_image_drop(&img->cache_entry);
61 if (evas_cserve2_use_get())
62 evas_cache2_image_close(&img->cache_entry);
63 else
64#endif
65 evas_cache_image_drop(&img->cache_entry);
66 58
67 eina_rectangle_free(rect); 59 eina_rectangle_free(rect);
68 } 60 }
@@ -91,12 +83,7 @@ _evas_outbuf_idle_flush(Outbuf *ob)
91 rect = img->extended_info; 83 rect = img->extended_info;
92 eina_rectangle_free(rect); 84 eina_rectangle_free(rect);
93 85
94#ifdef EVAS_CSERVE2 86 evas_cache_image_drop(&img->cache_entry);
95 if (evas_cserve2_use_get())
96 evas_cache2_image_close(&img->cache_entry);
97 else
98#endif
99 evas_cache_image_drop(&img->cache_entry);
100 } 87 }
101 else 88 else
102 { 89 {
@@ -107,12 +94,7 @@ _evas_outbuf_idle_flush(Outbuf *ob)
107 eina_list_remove_list(ob->priv.prev_pending_writes, 94 eina_list_remove_list(ob->priv.prev_pending_writes,
108 ob->priv.prev_pending_writes); 95 ob->priv.prev_pending_writes);
109 rect = img->extended_info; 96 rect = img->extended_info;
110#ifdef EVAS_CSERVE2 97 evas_cache_image_drop(&img->cache_entry);
111 if (evas_cserve2_use_get())
112 evas_cache2_image_close(&img->cache_entry);
113 else
114#endif
115 evas_cache_image_drop(&img->cache_entry);
116 98
117 eina_rectangle_free(rect); 99 eina_rectangle_free(rect);
118 } 100 }
@@ -160,14 +142,7 @@ _evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *surface_damage EINA_UNUSED, Tilebuf
160 img = ob->priv.onebuf; 142 img = ob->priv.onebuf;
161 ob->priv.onebuf = NULL; 143 ob->priv.onebuf = NULL;
162 if (img) 144 if (img)
163 { 145 evas_cache_image_drop(&img->cache_entry);
164#ifdef EVAS_CSERVE2
165 if (evas_cserve2_use_get())
166 evas_cache2_image_close(&img->cache_entry);
167 else
168#endif
169 evas_cache_image_drop(&img->cache_entry);
170 }
171 } 146 }
172 else 147 else
173 { 148 {
@@ -225,12 +200,7 @@ _evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *surface_damage EINA_UNUSED, Tilebuf
225 200
226 eina_rectangle_free(rect); 201 eina_rectangle_free(rect);
227 202
228#ifdef EVAS_CSERVE2 203 evas_cache_image_drop(&img->cache_entry);
229 if (evas_cserve2_use_get())
230 evas_cache2_image_close(&img->cache_entry);
231 else
232#endif
233 evas_cache_image_drop(&img->cache_entry);
234 204
235 i++; 205 i++;
236 } 206 }
@@ -319,25 +289,11 @@ _evas_outbuf_update_region_new(Outbuf *ob, int x, int y, int w, int h, int *cx,
319 return NULL; 289 return NULL;
320 } 290 }
321 291
322#ifdef EVAS_CSERVE2 292 img = (RGBA_Image *)
323 if (evas_cserve2_use_get()) 293 evas_cache_image_data(evas_common_image_cache_get(),
324 { 294 bw, bh, data,
325 img = (RGBA_Image *) 295 ob->priv.destination_alpha,
326 evas_cache2_image_data(evas_common_image_cache2_get(), 296 EVAS_COLORSPACE_ARGB8888);
327 bw, bh, data,
328 ob->priv.destination_alpha,
329 EVAS_COLORSPACE_ARGB8888);
330 }
331 else
332#endif
333 {
334 img = (RGBA_Image *)
335 evas_cache_image_data(evas_common_image_cache_get(),
336 bw, bh, data,
337 ob->priv.destination_alpha,
338 EVAS_COLORSPACE_ARGB8888);
339
340 }
341 297
342 ob->priv.onebuf = img; 298 ob->priv.onebuf = img;
343 if (!img) return NULL; 299 if (!img) return NULL;
@@ -348,12 +304,7 @@ _evas_outbuf_update_region_new(Outbuf *ob, int x, int y, int w, int h, int *cx,
348 304
349 if (!eina_array_push(&ob->priv.onebuf_regions, rect)) 305 if (!eina_array_push(&ob->priv.onebuf_regions, rect))
350 { 306 {
351#ifdef EVAS_CSERVE2 307 evas_cache_image_drop(&img->cache_entry);
352 if (evas_cserve2_use_get())
353 evas_cache2_image_close(&img->cache_entry);
354 else
355#endif
356 evas_cache_image_drop(&img->cache_entry);
357 308
358 eina_rectangle_free(rect); 309 eina_rectangle_free(rect);
359 return NULL; 310 return NULL;
@@ -373,12 +324,7 @@ _evas_outbuf_update_region_new(Outbuf *ob, int x, int y, int w, int h, int *cx,
373 if (!(rect = eina_rectangle_new(x, y, w, h))) 324 if (!(rect = eina_rectangle_new(x, y, w, h)))
374 return NULL; 325 return NULL;
375 326
376#ifdef EVAS_CSERVE2 327 img = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get());
377 if (evas_cserve2_use_get())
378 img = (RGBA_Image *)evas_cache2_image_empty(evas_common_image_cache2_get());
379 else
380#endif
381 img = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get());
382 328
383 if (!img) 329 if (!img)
384 { 330 {
@@ -390,12 +336,7 @@ _evas_outbuf_update_region_new(Outbuf *ob, int x, int y, int w, int h, int *cx,
390 img->cache_entry.h = h; 336 img->cache_entry.h = h;
391 img->cache_entry.flags.alpha |= ob->priv.destination_alpha ? 1 : 0; 337 img->cache_entry.flags.alpha |= ob->priv.destination_alpha ? 1 : 0;
392 338
393#ifdef EVAS_CSERVE2 339 evas_cache_image_surface_alloc(&img->cache_entry, w, h);
394 if (evas_cserve2_use_get())
395 evas_cache2_image_surface_alloc(&img->cache_entry, w, h);
396 else
397#endif
398 evas_cache_image_surface_alloc(&img->cache_entry, w, h);
399 340
400 img->extended_info = rect; 341 img->extended_info = rect;
401 342