bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Evas masking: Implement support for polygon draw (SW)

This commit is contained in:
Jaeun Choi 2014-11-20 14:56:36 +09:00 committed by Jean-Philippe Andre
parent 6747fadd9a
commit 4eb3a58edd
3 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/evas/common/evas_polygon.h
View File

@ -8,7 +8,7 @@ EAPI RGBA_Polygon_Point *evas_common_polygon_point_add (RGBA_Polygon_Point *p
EAPI RGBA_Polygon_Point *evas_common_polygon_points_clear (RGBA_Polygon_Point *points);
EAPI void evas_common_polygon_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Point *points, int x, int y);
EAPI void evas_common_polygon_rgba_draw (RGBA_Image *dst, int ext_x, int ext_y, int ext_w, int ext_h, DATA32 col, int render_op, RGBA_Polygon_Point *points, int x, int y);
EAPI void evas_common_polygon_rgba_draw (RGBA_Image *dst, int ext_x, int ext_y, int ext_w, int ext_h, DATA32 col, int render_op, RGBA_Polygon_Point *points, int x, int y, RGBA_Image *mask_ie, int mask_x, int mask_y);
#endif /* _EVAS_POLYGON_H */

36
src/lib/evas/common/evas_polygon_main.c
View File

@ -279,7 +279,10 @@ evas_common_polygon_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Po
free(point);
free(sorted_index);
func = evas_common_gfx_func_composite_color_span_get(dc->col.col, dst->cache_entry.flags.alpha, 1, dc->render_op);
if(dc->clip.mask)
func = evas_common_gfx_func_composite_mask_color_span_get(dc->col.col, dst->cache_entry.flags.alpha, 1, dc->render_op);
else
func = evas_common_gfx_func_composite_color_span_get(dc->col.col, dst->cache_entry.flags.alpha, 1, dc->render_op);
if (spans)
{
RGBA_Span *span;
@ -287,6 +290,8 @@ evas_common_polygon_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Po
EINA_INLIST_FOREACH(spans, span)
{
DATA32 *ptr;
DATA8 *mask;
RGBA_Image *mask_ie;
#ifdef HAVE_PIXMAN
# ifdef PIXMAN_POLY
@ -300,7 +305,16 @@ evas_common_polygon_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Po
#endif
{
ptr = dst->image.data + (span->y * (dst->cache_entry.w)) + span->x;
func(NULL, NULL, dc->col.col, ptr, span->w);
if (dc->clip.mask)
{
mask_ie = dc->clip.mask;
mask = mask_ie->image.data8
+ ((span->y - dc->clip.mask_y) * mask_ie->cache_entry.w)
+ (span->x - dc->clip.mask_x);
func(NULL, mask, dc->col.col, ptr, span->w);
}
else
func(NULL, NULL, dc->col.col, ptr, span->w);
}
}
while (spans)
@ -313,7 +327,7 @@ evas_common_polygon_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Po
}
EAPI void
evas_common_polygon_rgba_draw(RGBA_Image *dst, int ext_x, int ext_y, int ext_w, int ext_h, DATA32 col, int render_op, RGBA_Polygon_Point *points, int x, int y)
evas_common_polygon_rgba_draw(RGBA_Image *dst, int ext_x, int ext_y, int ext_w, int ext_h, DATA32 col, int render_op, RGBA_Polygon_Point *points, int x, int y, RGBA_Image *mask_ie, int mask_x, int mask_y)
{
RGBA_Gfx_Func func;
RGBA_Polygon_Point *pt;
@ -435,17 +449,29 @@ evas_common_polygon_rgba_draw(RGBA_Image *dst, int ext_x, int ext_y, int ext_w,
free(point);
free(sorted_index);
func = evas_common_gfx_func_composite_color_span_get(col, dst->cache_entry.flags.alpha, 1, render_op);
if (mask_ie)
func = evas_common_gfx_func_composite_mask_color_span_get(col, dst->cache_entry.flags.alpha, 1, render_op);
else
func = evas_common_gfx_func_composite_color_span_get(col, dst->cache_entry.flags.alpha, 1, render_op);
if (spans)
{
RGBA_Span *span;
DATA8 *mask;
EINA_INLIST_FOREACH(spans, span)
{
DATA32 *ptr;
ptr = dst->image.data + (span->y * (dst->cache_entry.w)) + span->x;
func(NULL, NULL, col, ptr, span->w);
if (mask_ie)
{
mask = mask_ie->image.data8
+ ((span->y - mask_y) * mask_ie->cache_entry.w)
+ (span->x - mask_x);
func(NULL, mask, col, ptr, span->w);
}
else
func(NULL, NULL, col, ptr, span->w);
}
while (spans)
{

9
src/modules/evas/engines/software_generic/evas_engine.c
View File

@ -321,6 +321,8 @@ struct _Evas_Thread_Command_Polygon
void *surface;
RGBA_Polygon_Point *points;
int x, y;
void *mask;
int mask_x, mask_y;
};
struct _Evas_Thread_Command_Image
@ -799,7 +801,8 @@ _draw_thread_polygon_draw(void *data)
(poly->surface,
poly->ext.x, poly->ext.y, poly->ext.w, poly->ext.h,
poly->col, poly->render_op,
poly->points, poly->x, poly->y);
poly->points, poly->x, poly->y,
poly->mask, poly->mask_x, poly->mask_y);
_draw_thread_polygon_cleanup(poly);
eina_mempool_free(_mp_command_polygon, poly);
@ -873,6 +876,10 @@ _polygon_draw_thread_cmd(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Po
cp->x = x;
cp->y = y;
cp->mask = dc->clip.mask;
cp->mask_x = dc->clip.mask_x;
cp->mask_y = dc->clip.mask_y;
evas_thread_cmd_enqueue(_draw_thread_polygon_draw, cp);
}