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

canvas vg: code refactoring. 

remove unnecessary reference cooridnates.
This commit is contained in:
Hermet Park 2019-09-18 21:51:14 +09:00
parent fc9fb3a7aa
commit 8f1010c288
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/lib/evas/canvas/efl_canvas_vg_container.c
View File

@ -64,11 +64,9 @@ _prepare_comp(Evas_Object_Protected_Data *obj, //vector object
uint32_t init_buffer = 0x0; uint32_t init_buffer = 0x0;
//1. Composite Size //1. Composite Size
Eina_Rect mbound; Eina_Size2D size;
mbound.x = 0; size.w = obj->cur->geometry.w;
mbound.y = 0; size.h = obj->cur->geometry.h;
mbound.w = obj->cur->geometry.w;
mbound.h = obj->cur->geometry.h;
//FIXME: If composite method is SUBSTRACT or INTERSECT, buffer fills in white color(Full alpha color). //FIXME: If composite method is SUBSTRACT or INTERSECT, buffer fills in white color(Full alpha color).
if (pd->comp.method == EFL_GFX_VG_COMPOSITE_METHOD_MASK_SUBSTRACT || if (pd->comp.method == EFL_GFX_VG_COMPOSITE_METHOD_MASK_SUBSTRACT ||
@ -77,8 +75,8 @@ _prepare_comp(Evas_Object_Protected_Data *obj, //vector object
//2. Reusable ector buffer? //2. Reusable ector buffer?
if (pd->comp.buffer && if (pd->comp.buffer &&
((pd->comp.bound.w != mbound.w) || ((pd->comp.size.w != size.w) ||
(pd->comp.bound.h != mbound.h))) (pd->comp.size.h != size.h)))
{ {
if (pd->comp.pixels) if (pd->comp.pixels)
@ -90,13 +88,13 @@ _prepare_comp(Evas_Object_Protected_Data *obj, //vector object
if (!pd->comp.buffer) if (!pd->comp.buffer)
{ {
pd->comp.buffer = ENFN->ector_buffer_new(ENC, obj->layer->evas->evas, pd->comp.buffer = ENFN->ector_buffer_new(ENC, obj->layer->evas->evas,
mbound.w, mbound.h, size.w, size.h,
EFL_GFX_COLORSPACE_ARGB8888, EFL_GFX_COLORSPACE_ARGB8888,
ECTOR_BUFFER_FLAG_DRAWABLE | ECTOR_BUFFER_FLAG_DRAWABLE |
ECTOR_BUFFER_FLAG_CPU_READABLE | ECTOR_BUFFER_FLAG_CPU_READABLE |
ECTOR_BUFFER_FLAG_CPU_WRITABLE); ECTOR_BUFFER_FLAG_CPU_WRITABLE);
pd->comp.bound.w = mbound.w; pd->comp.size.w = size.w;
pd->comp.bound.h = mbound.h; pd->comp.size.h = size.h;
pd->comp.vg_pd = obj; pd->comp.vg_pd = obj;
//Map //Map
@ -104,7 +102,7 @@ _prepare_comp(Evas_Object_Protected_Data *obj, //vector object
(ECTOR_BUFFER_FLAG_DRAWABLE | (ECTOR_BUFFER_FLAG_DRAWABLE |
ECTOR_BUFFER_FLAG_CPU_READABLE | ECTOR_BUFFER_FLAG_CPU_READABLE |
ECTOR_BUFFER_FLAG_CPU_WRITABLE), ECTOR_BUFFER_FLAG_CPU_WRITABLE),
0, 0, mbound.w, mbound.h, 0, 0, size.w, size.h,
EFL_GFX_COLORSPACE_ARGB8888, EFL_GFX_COLORSPACE_ARGB8888,
&pd->comp.stride); &pd->comp.stride);
if (!pd->comp.pixels) ERR("Failed to map VG composite buffer"); if (!pd->comp.pixels) ERR("Failed to map VG composite buffer");
@ -115,9 +113,6 @@ _prepare_comp(Evas_Object_Protected_Data *obj, //vector object
memset(pd->comp.pixels, init_buffer, pd->comp.length); memset(pd->comp.pixels, init_buffer, pd->comp.length);
} }
pd->comp.bound.x = mbound.x;
pd->comp.bound.y = mbound.y;
if (!pd->comp.buffer) ERR("Composite Buffer is invalid"); if (!pd->comp.buffer) ERR("Composite Buffer is invalid");
//FIXME: This code means that there is another composite container. //FIXME: This code means that there is another composite container.
@ -143,9 +138,9 @@ _prepare_comp(Evas_Object_Protected_Data *obj, //vector object
ptransform, comp, comp_method); ptransform, comp, comp_method);
//4. Generating Composite Image. //4. Generating Composite Image.
ector_buffer_pixels_set(surface, pd->comp.pixels, mbound.w, mbound.h, pd->comp.stride, ector_buffer_pixels_set(surface, pd->comp.pixels, size.w, size.h, pd->comp.stride,
EFL_GFX_COLORSPACE_ARGB8888, EINA_TRUE); EFL_GFX_COLORSPACE_ARGB8888, EINA_TRUE);
ector_surface_reference_point_set(surface, -mbound.x, -mbound.y); ector_surface_reference_point_set(surface, 0, 0);
_draw_comp(obj, comp_target, surface, engine, output, context); _draw_comp(obj, comp_target, surface, engine, output, context);
return pd->comp.buffer; return pd->comp.buffer;

2
src/lib/evas/canvas/evas_vg_private.h
View File

@ -86,7 +86,7 @@ typedef struct _Vg_Composite
void *pixels; //Composite pixel buffer (actual data) void *pixels; //Composite pixel buffer (actual data)
unsigned int length; //pixel buffer data size unsigned int length; //pixel buffer data size
unsigned int stride; //pixel buffer stride unsigned int stride; //pixel buffer stride
Eina_Rect bound; //Composite boundary Eina_Size2D size; //Composite boundary
Eina_List *src; //Composite Sources Eina_List *src; //Composite Sources
Efl_Gfx_Vg_Composite_Method method; //Composite Method Efl_Gfx_Vg_Composite_Method method; //Composite Method
} Vg_Comp; } Vg_Comp;