summaryrefslogtreecommitdiff
path: root/src/modules/evas/engines
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2018-08-30 13:25:05 +0900
committerHermet Park <hermetpark@gmail.com>2018-08-30 13:25:05 +0900
commitad9e13ea5657c845491cad7ba627dd93717c7d1b (patch)
tree2c38ad682621f233cf8d019588ae3187597148a0 /src/modules/evas/engines
parent65a36bee2b0ac6097739f60e5ba98a18e8c7e343 (diff)
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
Diffstat (limited to 'src/modules/evas/engines')
-rw-r--r--src/modules/evas/engines/software_x11/evas_engine.c8
-rw-r--r--src/modules/evas/engines/software_x11/evas_x_egl.c3
-rw-r--r--src/modules/evas/engines/software_x11/evas_xlib_outbuf.c111
-rw-r--r--src/modules/evas/engines/software_x11/evas_xlib_swapbuf.c40
4 files changed, 1 insertions, 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 @@
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_Software_X11.h" 4#include "Evas_Engine_Software_X11.h"
8#include "evas_engine.h" 5#include "evas_engine.h"
@@ -486,11 +483,6 @@ eng_image_native_set(void *engine, void *image, void *native)
486 im->native.func.free(im); 483 im->native.func.free(im);
487 } 484 }
488 485
489#ifdef EVAS_CSERVE2
490 if (evas_cserve2_use_get() && evas_cache2_image_cached(ie))
491 evas_cache2_image_close(ie);
492 else
493#endif
494 evas_cache_image_drop(ie); 486 evas_cache_image_drop(ie);
495 ie = ie2; 487 ie = ie2;
496 488
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 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#ifdef EVAS_CSERVE2
6#include "evas_cs2_private.h"
7#endif
8#include "evas_common_private.h" 5#include "evas_common_private.h"
9#include "evas_macros.h" 6#include "evas_macros.h"
10 7
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 @@
5#include <sys/time.h> 5#include <sys/time.h>
6#include <sys/utsname.h> 6#include <sys/utsname.h>
7 7
8#ifdef EVAS_CSERVE2
9#include "evas_cs2_private.h"
10#endif
11#include "evas_common_private.h" 8#include "evas_common_private.h"
12#include "evas_macros.h" 9#include "evas_macros.h"
13#include "evas_xlib_outbuf.h" 10#include "evas_xlib_outbuf.h"
@@ -177,13 +174,6 @@ evas_software_xlib_outbuf_free(Outbuf *buf)
177 im = buf->priv.pending_writes->data; 174 im = buf->priv.pending_writes->data;
178 buf->priv.pending_writes = eina_list_remove_list(buf->priv.pending_writes, buf->priv.pending_writes); 175 buf->priv.pending_writes = eina_list_remove_list(buf->priv.pending_writes, buf->priv.pending_writes);
179 obr = im->extended_info; 176 obr = im->extended_info;
180#ifdef EVAS_CSERVE2
181 if (evas_cserve2_use_get())
182 {
183 evas_cache2_image_close(&im->cache_entry);
184 }
185 else
186#endif
187 evas_cache_image_drop(&im->cache_entry); 177 evas_cache_image_drop(&im->cache_entry);
188 if (obr->xob) _unfind_xob(obr->xob, 0); 178 if (obr->xob) _unfind_xob(obr->xob, 0);
189 if (obr->mxob) _unfind_xob(obr->mxob, 0); 179 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
467 eina_spinlock_release(&(buf->priv.lock)); 457 eina_spinlock_release(&(buf->priv.lock));
468 return NULL; 458 return NULL;
469 } 459 }
470#ifdef EVAS_CSERVE2
471 if (evas_cserve2_use_get())
472 {
473 im = (RGBA_Image *)evas_cache2_image_data(evas_common_image_cache2_get(),
474 buf->w, buf->h,
475 (DATA32 *)evas_software_xlib_x_output_buffer_data(obr->xob, &bpl),
476 alpha, EVAS_COLORSPACE_ARGB8888);
477 }
478 else
479#endif
480 im = (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(), 460 im = (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(),
481 buf->w, buf->h, 461 buf->w, buf->h,
482 (DATA32 *)evas_software_xlib_x_output_buffer_data(obr->xob, &bpl), 462 (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
499 } 479 }
500 else 480 else
501 { 481 {
502#ifdef EVAS_CSERVE2
503 if (evas_cserve2_use_get())
504 im = (RGBA_Image *)evas_cache2_image_empty(evas_common_image_cache2_get());
505 else
506#endif
507 im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get()); 482 im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get());
508 if (!im) 483 if (!im)
509 { 484 {
@@ -512,11 +487,6 @@ evas_software_xlib_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w
512 return NULL; 487 return NULL;
513 } 488 }
514 im->cache_entry.flags.alpha |= alpha ? 1 : 0; 489 im->cache_entry.flags.alpha |= alpha ? 1 : 0;
515#ifdef EVAS_CSERVE2
516 if (evas_cserve2_use_get())
517 evas_cache2_image_surface_alloc(&im->cache_entry, buf->w, buf->h);
518 else
519#endif
520 evas_cache_image_surface_alloc(&im->cache_entry, buf->w, buf->h); 490 evas_cache_image_surface_alloc(&im->cache_entry, buf->w, buf->h);
521 im->extended_info = obr; 491 im->extended_info = obr;
522 if ((buf->rot == 0) || (buf->rot == 180)) 492 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
529 NULL); 499 NULL);
530 if (!obr->xob) 500 if (!obr->xob)
531 { 501 {
532#ifdef EVAS_CSERVE2
533 if (evas_cserve2_use_get())
534 {
535 evas_cache2_image_close(&im->cache_entry);
536 }
537 else
538#endif
539 evas_cache_image_drop(&im->cache_entry); 502 evas_cache_image_drop(&im->cache_entry);
540 free(obr); 503 free(obr);
541 eina_spinlock_release(&(buf->priv.lock)); 504 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
558 NULL); 521 NULL);
559 if (!obr->xob) 522 if (!obr->xob)
560 { 523 {
561#ifdef EVAS_CSERVE2
562 if (evas_cserve2_use_get())
563 {
564 evas_cache2_image_close(&im->cache_entry);
565 }
566 else
567#endif
568 evas_cache_image_drop(&im->cache_entry); 524 evas_cache_image_drop(&im->cache_entry);
569 free(obr); 525 free(obr);
570 eina_spinlock_release(&(buf->priv.lock)); 526 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
633 eina_spinlock_release(&(buf->priv.lock)); 589 eina_spinlock_release(&(buf->priv.lock));
634 return NULL; 590 return NULL;
635 } 591 }
636#ifdef EVAS_CSERVE2
637 if (evas_cserve2_use_get())
638 im = (RGBA_Image *)evas_cache2_image_data(evas_common_image_cache2_get(),
639 w, h,
640 (DATA32 *)evas_software_xlib_x_output_buffer_data(obr->xob, &bpl),
641 alpha, EVAS_COLORSPACE_ARGB8888);
642 else
643#endif
644 im = (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(), 592 im = (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(),
645 w, h, 593 w, h,
646 (DATA32 *)evas_software_xlib_x_output_buffer_data(obr->xob, &bpl), 594 (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
662 } 610 }
663 else 611 else
664 { 612 {
665#ifdef EVAS_CSERVE2
666 if (evas_cserve2_use_get())
667 im = (RGBA_Image *)evas_cache2_image_empty(evas_common_image_cache2_get());
668 else
669#endif
670 im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get()); 613 im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get());
671 if (!im) 614 if (!im)
672 { 615 {
@@ -677,11 +620,6 @@ evas_software_xlib_outbuf_new_region_for_update(Outbuf *buf, int x, int y, int w
677 im->cache_entry.w = w; 620 im->cache_entry.w = w;
678 im->cache_entry.h = h; 621 im->cache_entry.h = h;
679 im->cache_entry.flags.alpha |= alpha ? 1 : 0; 622 im->cache_entry.flags.alpha |= alpha ? 1 : 0;
680#ifdef EVAS_CSERVE2
681 if (evas_cserve2_use_get())
682 evas_cache2_image_surface_alloc(&im->cache_entry, w, h);
683 else
684#endif
685 evas_cache_image_surface_alloc(&im->cache_entry, w, h); 623 evas_cache_image_surface_alloc(&im->cache_entry, w, h);
686 im->extended_info = obr; 624 im->extended_info = obr;
687 if ((buf->rot == 0) || (buf->rot == 180)) 625 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
694 NULL); 632 NULL);
695 if (!obr->xob) 633 if (!obr->xob)
696 { 634 {
697#ifdef EVAS_CSERVE2
698 if (evas_cserve2_use_get())
699 {
700 evas_cache2_image_close(&im->cache_entry);
701 }
702 else
703#endif
704 evas_cache_image_drop(&im->cache_entry); 635 evas_cache_image_drop(&im->cache_entry);
705 free(obr); 636 free(obr);
706 eina_spinlock_release(&(buf->priv.lock)); 637 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
723 NULL); 654 NULL);
724 if (!obr->xob) 655 if (!obr->xob)
725 { 656 {
726#ifdef EVAS_CSERVE2
727 if (evas_cserve2_use_get())
728 {
729 evas_cache2_image_close(&im->cache_entry);
730 }
731 else
732#endif
733 evas_cache_image_drop(&im->cache_entry); 657 evas_cache_image_drop(&im->cache_entry);
734 free(obr); 658 free(obr);
735 eina_spinlock_release(&(buf->priv.lock)); 659 eina_spinlock_release(&(buf->priv.lock));
@@ -861,13 +785,6 @@ evas_software_xlib_outbuf_flush(Outbuf *buf, Tilebuf_Rect *surface_damage EINA_U
861 eina_list_remove_list(buf->priv.prev_pending_writes, 785 eina_list_remove_list(buf->priv.prev_pending_writes,
862 buf->priv.prev_pending_writes); 786 buf->priv.prev_pending_writes);
863 obr = im->extended_info; 787 obr = im->extended_info;
864#ifdef EVAS_CSERVE2
865 if (evas_cserve2_use_get())
866 {
867 evas_cache2_image_close(&im->cache_entry);
868 }
869 else
870#endif
871 evas_cache_image_drop(&im->cache_entry); 788 evas_cache_image_drop(&im->cache_entry);
872 if (obr->xob) _unfind_xob(obr->xob, 0); 789 if (obr->xob) _unfind_xob(obr->xob, 0);
873 if (obr->mxob) _unfind_xob(obr->mxob, 0); 790 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
905 im = eina_list_data_get(buf->priv.pending_writes); 822 im = eina_list_data_get(buf->priv.pending_writes);
906 buf->priv.pending_writes = eina_list_remove_list(buf->priv.pending_writes, buf->priv.pending_writes); 823 buf->priv.pending_writes = eina_list_remove_list(buf->priv.pending_writes, buf->priv.pending_writes);
907 obr = im->extended_info; 824 obr = im->extended_info;
908#ifdef EVAS_CSERVE2
909 if (evas_cserve2_use_get())
910 {
911 evas_cache2_image_close(&im->cache_entry);
912 }
913 else
914#endif
915 evas_cache_image_drop(&im->cache_entry); 825 evas_cache_image_drop(&im->cache_entry);
916 if (obr->xob) _unfind_xob(obr->xob, 0); 826 if (obr->xob) _unfind_xob(obr->xob, 0);
917 if (obr->mxob) _unfind_xob(obr->mxob, 0); 827 if (obr->mxob) _unfind_xob(obr->mxob, 0);
918 free(obr); 828 free(obr);
919#ifdef EVAS_CSERVE2
920 if (evas_cserve2_use_get())
921 {
922 evas_cache2_image_close(&im->cache_entry);
923 }
924 else
925#endif
926 evas_cache_image_drop(&im->cache_entry); 829 evas_cache_image_drop(&im->cache_entry);
927 } 830 }
928#endif 831#endif
@@ -956,13 +859,6 @@ evas_software_xlib_outbuf_idle_flush(Outbuf *buf)
956 SHMPOOL_UNLOCK(); 859 SHMPOOL_UNLOCK();
957 } 860 }
958 free(obr); 861 free(obr);
959#ifdef EVAS_CSERVE2
960 if (evas_cserve2_use_get())
961 {
962 evas_cache2_image_close(&im->cache_entry);
963 }
964 else
965#endif
966 evas_cache_image_drop(&im->cache_entry); 862 evas_cache_image_drop(&im->cache_entry);
967 } 863 }
968 else 864 else
@@ -978,13 +874,6 @@ evas_software_xlib_outbuf_idle_flush(Outbuf *buf)
978 eina_list_remove_list(buf->priv.prev_pending_writes, 874 eina_list_remove_list(buf->priv.prev_pending_writes,
979 buf->priv.prev_pending_writes); 875 buf->priv.prev_pending_writes);
980 obr = im->extended_info; 876 obr = im->extended_info;
981#ifdef EVAS_CSERVE2
982 if (evas_cserve2_use_get())
983 {
984 evas_cache2_image_close(&im->cache_entry);
985 }
986 else
987#endif
988 evas_cache_image_drop(&im->cache_entry); 877 evas_cache_image_drop(&im->cache_entry);
989 if (obr->xob) _unfind_xob(obr->xob, 0); 878 if (obr->xob) _unfind_xob(obr->xob, 0);
990 if (obr->mxob) _unfind_xob(obr->mxob, 0); 879 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 @@
5#include <sys/time.h> 5#include <sys/time.h>
6#include <sys/utsname.h> 6#include <sys/utsname.h>
7 7
8#ifdef EVAS_CSERVE2
9#include "evas_cs2_private.h"
10#endif
11#include "evas_common_private.h" 8#include "evas_common_private.h"
12#include "evas_macros.h" 9#include "evas_macros.h"
13 10
@@ -244,14 +241,6 @@ evas_software_xlib_swapbuf_new_region_for_update(Outbuf *buf, int x, int y, int
244 data = evas_xlib_swapper_buffer_map(buf->priv.swapper, &bpl, 241 data = evas_xlib_swapper_buffer_map(buf->priv.swapper, &bpl,
245 &(ww), &(hh)); 242 &(ww), &(hh));
246 // To take stride into account, we do use bpl as the real image width, but return the real useful one. 243 // To take stride into account, we do use bpl as the real image width, but return the real useful one.
247#ifdef EVAS_CSERVE2
248 if (evas_cserve2_use_get())
249 im = (RGBA_Image *)evas_cache2_image_data(evas_common_image_cache2_get(),
250 bpl / bpp, hh, data,
251 buf->priv.destination_alpha,
252 EVAS_COLORSPACE_ARGB8888);
253 else
254#endif
255 im = (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(), 244 im = (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(),
256 bpl / bpp, hh, data, 245 bpl / bpp, hh, data,
257 buf->priv.destination_alpha, 246 buf->priv.destination_alpha,
@@ -262,11 +251,6 @@ evas_software_xlib_swapbuf_new_region_for_update(Outbuf *buf, int x, int y, int
262 rect = eina_rectangle_new(x, y, w, h); 251 rect = eina_rectangle_new(x, y, w, h);
263 if (!eina_array_push(&buf->priv.onebuf_regions, rect)) 252 if (!eina_array_push(&buf->priv.onebuf_regions, rect))
264 { 253 {
265#ifdef EVAS_CSERVE2
266 if (evas_cserve2_use_get())
267 evas_cache2_image_close(&im->cache_entry);
268 else
269#endif
270 evas_cache_image_drop(&im->cache_entry); 254 evas_cache_image_drop(&im->cache_entry);
271 eina_rectangle_free(rect); 255 eina_rectangle_free(rect);
272 return NULL; 256 return NULL;
@@ -286,11 +270,6 @@ evas_software_xlib_swapbuf_new_region_for_update(Outbuf *buf, int x, int y, int
286 270
287 rect = eina_rectangle_new(x, y, w, h); 271 rect = eina_rectangle_new(x, y, w, h);
288 if (!rect) return NULL; 272 if (!rect) return NULL;
289#ifdef EVAS_CSERVE2
290 if (evas_cserve2_use_get())
291 im = (RGBA_Image *)evas_cache2_image_empty(evas_common_image_cache2_get());
292 else
293#endif
294 im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get()); 273 im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get());
295 if (!im) 274 if (!im)
296 { 275 {
@@ -298,11 +277,6 @@ evas_software_xlib_swapbuf_new_region_for_update(Outbuf *buf, int x, int y, int
298 return NULL; 277 return NULL;
299 } 278 }
300 im->cache_entry.flags.alpha |= buf->priv.destination_alpha ? 1 : 0; 279 im->cache_entry.flags.alpha |= buf->priv.destination_alpha ? 1 : 0;
301#ifdef EVAS_CSERVE2
302 if (evas_cserve2_use_get())
303 evas_cache2_image_surface_alloc(&im->cache_entry, w, h);
304 else
305#endif
306 evas_cache_image_surface_alloc(&im->cache_entry, w, h); 280 evas_cache_image_surface_alloc(&im->cache_entry, w, h);
307 im->extended_info = rect; 281 im->extended_info = rect;
308 buf->priv.pending_writes = eina_list_append(buf->priv.pending_writes, im); 282 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_
343 im = buf->priv.onebuf; 317 im = buf->priv.onebuf;
344 buf->priv.onebuf = NULL; 318 buf->priv.onebuf = NULL;
345 if (im) 319 if (im)
346 { 320 evas_cache_image_drop(&im->cache_entry);
347#ifdef EVAS_CSERVE2
348 if (evas_cserve2_use_get())
349 evas_cache2_image_close(&im->cache_entry);
350 else
351#endif
352 evas_cache_image_drop(&im->cache_entry);
353 }
354 } 321 }
355 else 322 else
356 { 323 {
@@ -398,11 +365,6 @@ evas_software_xlib_swapbuf_flush(Outbuf *buf, Tilebuf_Rect *surface_damage EINA_
398 result[i].h = w; 365 result[i].h = w;
399 } 366 }
400 eina_rectangle_free(rect); 367 eina_rectangle_free(rect);
401#ifdef EVAS_CSERVE2
402 if (evas_cserve2_use_get())
403 evas_cache2_image_close(&im->cache_entry);
404 else
405#endif
406 evas_cache_image_drop(&im->cache_entry); 368 evas_cache_image_drop(&im->cache_entry);
407 i++; 369 i++;
408 } 370 }