summaryrefslogtreecommitdiff
path: root/src/modules/evas/engines
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2018-08-30 13:23:23 +0900
committerHermet Park <hermetpark@gmail.com>2018-08-30 13:23:23 +0900
commit65a36bee2b0ac6097739f60e5ba98a18e8c7e343 (patch)
tree1b4b750fb4deaabdf4ed7b874b3fd188c3a72132 /src/modules/evas/engines
parent2d9168e9561a6dad26f523e754a2a9a1dfb8580a (diff)
evas-buffer: Remove cserve2 support
Summary: ref T7226 Depends on D6926 Reviewers: raster, cedric, zmike, Hermet Reviewed By: Hermet Subscribers: #reviewers, #committers Tags: #efl Maniphest Tasks: T7226 Differential Revision: https://phab.enlightenment.org/D6927
Diffstat (limited to 'src/modules/evas/engines')
-rw-r--r--src/modules/evas/engines/buffer/evas_outbuf.c91
1 files changed, 17 insertions, 74 deletions
diff --git a/src/modules/evas/engines/buffer/evas_outbuf.c b/src/modules/evas/engines/buffer/evas_outbuf.c
index f984e704d0..a8dd3d0efe 100644
--- a/src/modules/evas/engines/buffer/evas_outbuf.c
+++ b/src/modules/evas/engines/buffer/evas_outbuf.c
@@ -2,10 +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
9#include "evas_common_private.h" 5#include "evas_common_private.h"
10#include "evas_engine.h" 6#include "evas_engine.h"
11 7
@@ -18,14 +14,7 @@ void
18evas_buffer_outbuf_buf_free(Outbuf *buf) 14evas_buffer_outbuf_buf_free(Outbuf *buf)
19{ 15{
20 if (buf->priv.back_buf) 16 if (buf->priv.back_buf)
21 { 17 evas_cache_image_drop(&buf->priv.back_buf->cache_entry);
22#ifdef EVAS_CSERVE2
23 if (evas_cserve2_use_get())
24 evas_cache2_image_close(&buf->priv.back_buf->cache_entry);
25 else
26#endif
27 evas_cache_image_drop(&buf->priv.back_buf->cache_entry);
28 }
29 free(buf); 18 free(buf);
30} 19}
31 20
@@ -57,34 +46,18 @@ evas_buffer_outbuf_buf_update_fb(Outbuf *buf, int w, int h, Outbuf_Depth depth,
57 (buf->dest) && (buf->dest_row_bytes == (buf->w * sizeof(DATA32)))) 46 (buf->dest) && (buf->dest_row_bytes == (buf->w * sizeof(DATA32))))
58 { 47 {
59 memset(buf->dest, 0, h * buf->dest_row_bytes); 48 memset(buf->dest, 0, h * buf->dest_row_bytes);
60#ifdef EVAS_CSERVE2 49 buf->priv.back_buf =
61 if (evas_cserve2_use_get()) 50 (RGBA_Image *) evas_cache_image_data(evas_common_image_cache_get(),
62 buf->priv.back_buf = (RGBA_Image *) evas_cache2_image_data(evas_common_image_cache2_get(), 51 w, h, buf->dest,
63 w, h, 52 1, EVAS_COLORSPACE_ARGB8888);
64 buf->dest,
65 1, EVAS_COLORSPACE_ARGB8888);
66 else
67#endif
68 buf->priv.back_buf = (RGBA_Image *) evas_cache_image_data(evas_common_image_cache_get(),
69 w, h,
70 buf->dest,
71 1, EVAS_COLORSPACE_ARGB8888);
72 } 53 }
73 else if ((buf->depth == OUTBUF_DEPTH_RGB_32BPP_888_8888) && 54 else if ((buf->depth == OUTBUF_DEPTH_RGB_32BPP_888_8888) &&
74 (buf->dest) && (buf->dest_row_bytes == (buf->w * sizeof(DATA32)))) 55 (buf->dest) && (buf->dest_row_bytes == (buf->w * sizeof(DATA32))))
75 { 56 {
76#ifdef EVAS_CSERVE2 57 buf->priv.back_buf =
77 if (evas_cserve2_use_get()) 58 (RGBA_Image *) evas_cache_image_data(evas_common_image_cache_get(),
78 buf->priv.back_buf = (RGBA_Image *) evas_cache2_image_data(evas_common_image_cache2_get(), 59 w, h, buf->dest,
79 w, h, 60 0, EVAS_COLORSPACE_ARGB8888);
80 buf->dest,
81 0, EVAS_COLORSPACE_ARGB8888);
82 else
83#endif
84 buf->priv.back_buf = (RGBA_Image *) evas_cache_image_data(evas_common_image_cache_get(),
85 w, h,
86 buf->dest,
87 0, EVAS_COLORSPACE_ARGB8888);
88 } 61 }
89} 62}
90 63
@@ -130,11 +103,6 @@ evas_buffer_outbuf_buf_new_region_for_update(Outbuf *buf, int x, int y, int w, i
130 else 103 else
131 { 104 {
132 *cx = 0; *cy = 0; *cw = w; *ch = h; 105 *cx = 0; *cy = 0; *cw = w; *ch = h;
133#ifdef EVAS_CSERVE2
134 if (evas_cserve2_use_get())
135 im = (RGBA_Image *)evas_cache2_image_empty(evas_common_image_cache2_get());
136 else
137#endif
138 im = (RGBA_Image *) evas_cache_image_empty(evas_common_image_cache_get()); 106 im = (RGBA_Image *) evas_cache_image_empty(evas_common_image_cache_get());
139 if (im) 107 if (im)
140 { 108 {
@@ -144,11 +112,6 @@ evas_buffer_outbuf_buf_new_region_for_update(Outbuf *buf, int x, int y, int w, i
144 im->cache_entry.flags.alpha = 1; 112 im->cache_entry.flags.alpha = 1;
145 } 113 }
146 114
147#ifdef EVAS_CSERVE2
148 if (evas_cserve2_use_get())
149 evas_cache2_image_size_set(&im->cache_entry, w, h);
150 else
151#endif
152 im = (RGBA_Image *) evas_cache_image_size_set(&im->cache_entry, w, h); 115 im = (RGBA_Image *) evas_cache_image_size_set(&im->cache_entry, w, h);
153 } 116 }
154 } 117 }
@@ -159,14 +122,7 @@ void
159evas_buffer_outbuf_buf_free_region_for_update(Outbuf *buf, RGBA_Image *update) 122evas_buffer_outbuf_buf_free_region_for_update(Outbuf *buf, RGBA_Image *update)
160{ 123{
161 if (update != buf->priv.back_buf) 124 if (update != buf->priv.back_buf)
162 { 125 evas_cache_image_drop(&update->cache_entry);
163#ifdef EVAS_CSERVE2
164 if (evas_cserve2_use_get())
165 evas_cache2_image_close(&update->cache_entry);
166 else
167#endif
168 evas_cache_image_drop(&update->cache_entry);
169 }
170} 126}
171 127
172void 128void
@@ -177,26 +133,13 @@ evas_buffer_outbuf_buf_switch_buffer(Outbuf *buf, Tilebuf_Rect *surface_damage E
177 buf->dest = buf->func.switch_buffer(buf->switch_data, buf->dest); 133 buf->dest = buf->func.switch_buffer(buf->switch_data, buf->dest);
178 if (buf->priv.back_buf) 134 if (buf->priv.back_buf)
179 { 135 {
180#ifdef EVAS_CSERVE2 136 evas_cache_image_drop(&buf->priv.back_buf->cache_entry);
181 if (evas_cserve2_use_get()) 137 buf->priv.back_buf =
182 { 138 (RGBA_Image *) evas_cache_image_data(evas_common_image_cache_get(),
183 evas_cache2_image_close(&buf->priv.back_buf->cache_entry); 139 buf->w, buf->h,
184 buf->priv.back_buf = (RGBA_Image *) evas_cache2_image_data(evas_common_image_cache2_get(), 140 buf->dest,
185 buf->w, buf->h, 141 buf->depth == OUTBUF_DEPTH_ARGB_32BPP_8888_8888 ? 1 : 0,
186 buf->dest, 142 EVAS_COLORSPACE_ARGB8888);
187 buf->depth == OUTBUF_DEPTH_ARGB_32BPP_8888_8888 ? 1 : 0,
188 EVAS_COLORSPACE_ARGB8888);
189 }
190 else
191#endif
192 {
193 evas_cache_image_drop(&buf->priv.back_buf->cache_entry);
194 buf->priv.back_buf = (RGBA_Image *) evas_cache_image_data(evas_common_image_cache_get(),
195 buf->w, buf->h,
196 buf->dest,
197 buf->depth == OUTBUF_DEPTH_ARGB_32BPP_8888_8888 ? 1 : 0,
198 EVAS_COLORSPACE_ARGB8888);
199 }
200 } 143 }
201 } 144 }
202} 145}