summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2017-08-25 10:52:07 -0700
committerCedric BAIL <cedric@osg.samsung.com>2017-08-25 10:52:07 -0700
commit68b846c1f46146a1ef921168c2cb926945ff387c (patch)
tree8156eb309dd954a9ee23a5a688e4bcdef55a0ef9 /src/modules
parentcc4d41c89001ecc449cdfa5d631ffae8aacd8a9c (diff)
evas: remove unecessary use of output in filter code.
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/evas/engines/software_generic/filters/evas_filter_blend.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/modules/evas/engines/software_generic/filters/evas_filter_blend.c b/src/modules/evas/engines/software_generic/filters/evas_filter_blend.c
index 57c9567..5573010 100644
--- a/src/modules/evas/engines/software_generic/filters/evas_filter_blend.c
+++ b/src/modules/evas/engines/software_generic/filters/evas_filter_blend.c
@@ -5,8 +5,8 @@
5// Use a better formula than R+G+B for rgba to alpha conversion (RGB to YCbCr) 5// Use a better formula than R+G+B for rgba to alpha conversion (RGB to YCbCr)
6#define RGBA2ALPHA_WEIGHTED 1 6#define RGBA2ALPHA_WEIGHTED 1
7 7
8typedef Eina_Bool (*draw_func) (void *data, void *context, const void *src_map, unsigned int src_stride, void *dst_map, unsigned int dst_stride, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth, Eina_Bool do_async); 8typedef Eina_Bool (*draw_func) (void *context, const void *src_map, unsigned int src_stride, void *dst_map, unsigned int dst_stride, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth, Eina_Bool do_async);
9static Eina_Bool _mapped_blend(void *data, void *drawctx, const void *src_map, unsigned int src_stride, void *dst_map, unsigned int dst_stride, Evas_Filter_Fill_Mode fillmode, int sx, int sy, int sw, int sh, int dx, int dy, int dw, int dh, draw_func image_draw); 9static Eina_Bool _mapped_blend(void *drawctx, const void *src_map, unsigned int src_stride, void *dst_map, unsigned int dst_stride, Evas_Filter_Fill_Mode fillmode, int sx, int sy, int sw, int sh, int dx, int dy, int dw, int dh, draw_func image_draw);
10 10
11struct Filter_Blend_Draw_Context 11struct Filter_Blend_Draw_Context
12{ 12{
@@ -17,7 +17,7 @@ struct Filter_Blend_Draw_Context
17#define LINELEN(stride, ptr) (stride / (sizeof(*ptr))) 17#define LINELEN(stride, ptr) (stride / (sizeof(*ptr)))
18 18
19static Eina_Bool 19static Eina_Bool
20_image_draw_cpu_alpha_alpha(void *data EINA_UNUSED, void *context, 20_image_draw_cpu_alpha_alpha(void *context,
21 const void *src_map, unsigned int src_stride, 21 const void *src_map, unsigned int src_stride,
22 void *dst_map, unsigned int dst_stride, 22 void *dst_map, unsigned int dst_stride,
23 int src_x, int src_y, int src_w, int src_h, 23 int src_x, int src_y, int src_w, int src_h,
@@ -52,7 +52,7 @@ _image_draw_cpu_alpha_alpha(void *data EINA_UNUSED, void *context,
52} 52}
53 53
54static Eina_Bool 54static Eina_Bool
55_image_draw_cpu_alpha_rgba(void *data EINA_UNUSED, void *context, 55_image_draw_cpu_alpha_rgba(void *context,
56 const void *src_map, unsigned int src_stride, 56 const void *src_map, unsigned int src_stride,
57 void *dst_map, unsigned int dst_stride, 57 void *dst_map, unsigned int dst_stride,
58 int src_x, int src_y, int src_w, int src_h, 58 int src_x, int src_y, int src_w, int src_h,
@@ -87,7 +87,7 @@ _image_draw_cpu_alpha_rgba(void *data EINA_UNUSED, void *context,
87} 87}
88 88
89static Eina_Bool 89static Eina_Bool
90_image_draw_cpu_rgba_rgba(void *data EINA_UNUSED, void *context, 90_image_draw_cpu_rgba_rgba(void *context,
91 const void *src_map, unsigned int src_stride, 91 const void *src_map, unsigned int src_stride,
92 void *dst_map, unsigned int dst_stride, 92 void *dst_map, unsigned int dst_stride,
93 int src_x, int src_y, int src_w, int src_h, 93 int src_x, int src_y, int src_w, int src_h,
@@ -125,7 +125,7 @@ _image_draw_cpu_rgba_rgba(void *data EINA_UNUSED, void *context,
125} 125}
126 126
127static Eina_Bool 127static Eina_Bool
128_image_draw_cpu_rgba_alpha(void *data EINA_UNUSED, void *context EINA_UNUSED, 128_image_draw_cpu_rgba_alpha(void *context EINA_UNUSED,
129 const void *src_map, unsigned int src_stride, 129 const void *src_map, unsigned int src_stride,
130 void *dst_map, unsigned int dst_stride, 130 void *dst_map, unsigned int dst_stride,
131 int src_x, int src_y, int src_w, int src_h, 131 int src_x, int src_y, int src_w, int src_h,
@@ -222,8 +222,8 @@ _filter_blend_cpu_generic_do(Evas_Filter_Command *cmd, draw_func image_draw)
222 dc.rop = cmd->draw.rop; 222 dc.rop = cmd->draw.rop;
223 dc.color = ARGB_JOIN(cmd->draw.A, cmd->draw.R, cmd->draw.G, cmd->draw.B); 223 dc.color = ARGB_JOIN(cmd->draw.A, cmd->draw.R, cmd->draw.G, cmd->draw.B);
224 224
225 ret = _mapped_blend(CMD_ENDT, &dc, src, src_stride, dst, dst_stride, cmd->draw.fillmode, 225 ret = _mapped_blend(&dc, src, src_stride, dst, dst_stride, cmd->draw.fillmode,
226 sx, sy, sw, sh, dx, dy, dw, dh, image_draw); 226 sx, sy, sw, sh, dx, dy, dw, dh, image_draw);
227 227
228end: 228end:
229 if (src) ector_buffer_unmap(src_fb->buffer, src, src_len); 229 if (src) ector_buffer_unmap(src_fb->buffer, src, src_len);
@@ -256,7 +256,7 @@ _filter_blend_cpu_rgba(Evas_Filter_Command *cmd)
256} 256}
257 257
258static Eina_Bool 258static Eina_Bool
259_mapped_blend(void *data, void *drawctx, 259_mapped_blend(void *drawctx,
260 const void *src_map, unsigned int src_stride, 260 const void *src_map, unsigned int src_stride,
261 void *dst_map, unsigned int dst_stride, 261 void *dst_map, unsigned int dst_stride,
262 Evas_Filter_Fill_Mode fillmode, 262 Evas_Filter_Fill_Mode fillmode,
@@ -277,7 +277,7 @@ _mapped_blend(void *data, void *drawctx,
277 _clip_to_target(&sx, &sy, sw, sh, dx, dy, dw, dh, &dx, &dy, &rows, &cols); 277 _clip_to_target(&sx, &sy, sw, sh, dx, dy, dw, dh, &dx, &dy, &rows, &cols);
278 XDBG("blend: %d,%d,%d,%d --> %d,%d,%d,%d (from %dx%d to %dx%d +%d,%d)", 278 XDBG("blend: %d,%d,%d,%d --> %d,%d,%d,%d (from %dx%d to %dx%d +%d,%d)",
279 0, 0, sw, sh, dx, dy, cols, rows, sw, sh, dw, dh, dx, dy); 279 0, 0, sw, sh, dx, dy, cols, rows, sw, sh, dw, dh, dx, dy);
280 image_draw(data, drawctx, 280 image_draw(drawctx,
281 src_map, src_stride, dst_map, dst_stride, 281 src_map, src_stride, dst_map, dst_stride,
282 sx, sy, cols, rows, // src 282 sx, sy, cols, rows, // src
283 dx, dy, cols, rows, // dst 283 dx, dy, cols, rows, // dst
@@ -416,7 +416,7 @@ _mapped_blend(void *data, void *drawctx,
416 col, row, src_x, src_y, src_w, src_h, 416 col, row, src_x, src_y, src_w, src_h,
417 dst_x, dst_y, dst_w, dst_h, 417 dst_x, dst_y, dst_w, dst_h,
418 sw, sh, dw, dh); 418 sw, sh, dw, dh);
419 image_draw(data, drawctx, 419 image_draw(drawctx,
420 src_map, src_stride, dst_map, dst_stride, 420 src_map, src_stride, dst_map, dst_stride,
421 src_x, src_y, src_w, src_h, 421 src_x, src_y, src_w, src_h,
422 dst_x, dst_y, dst_w, dst_h, 422 dst_x, dst_y, dst_w, dst_h,