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

evas: introduce begin and end operation on an Ector surface. 

This is necessary for GL has you want to map once and run with it, but it
will also help the software backend to not remap the surface all the time !
This commit is contained in:
Cedric BAIL 2015-04-03 16:30:44 +02:00
parent 0f6328b04f
commit f2380b0920
3 changed files with 91 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/evas/canvas/evas_object_vg.c
View File

@ -146,7 +146,7 @@ _evas_vg_render(Evas_Object_Protected_Data *obj,
{
Evas_VG_Node_Data *nd = eo_data_scope_get(n, EVAS_VG_NODE_CLASS);
obj->layer->evas->engine.func->ector_draw(output, context, surface, nd->renderer, clips, x, y, do_async);
obj->layer->evas->engine.func->ector_renderer_draw(output, context, surface, nd->renderer, clips, x, y, do_async);
}
}
@ -179,9 +179,11 @@ evas_object_vg_render(Evas_Object *eo_obj EINA_UNUSED,
context);
obj->layer->evas->engine.func->context_render_op_set(output, context,
obj->cur->render_op);
obj->layer->evas->engine.func->ector_begin(output, context, surface, do_async);
_evas_vg_render(obj, output, context, surface, vd->root, NULL,
obj->cur->geometry.x + x, obj->cur->geometry.y + y,
do_async);
obj->layer->evas->engine.func->ector_end(output, context, surface, do_async);
}
static void

4
src/lib/evas/include/evas_private.h
View File

@ -1368,7 +1368,9 @@ struct _Evas_Func
void (*texture_image_set) (void *data, void *texture, void *image);
Ector_Surface *(*ector_get) (void *data);
void (*ector_draw) (void *data, void *context, void *surface, Ector_Renderer *r, Eina_Array *clips, int x, int y, Eina_Bool do_async);
void (*ector_begin) (void *data, void *context, void *surface, Eina_Bool do_async);
void (*ector_renderer_draw) (void *data, void *context, void *surface, Ector_Renderer *r, Eina_Array *clips, int x, int y, Eina_Bool do_async);
void (*ector_end) (void *data, void *context, void *surface, Eina_Bool do_async);
};
struct _Evas_Image_Save_Func

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

@ -297,6 +297,7 @@ typedef struct _Evas_Thread_Command_Font Evas_Thread_Command_Font;
typedef struct _Evas_Thread_Command_Map Evas_Thread_Command_Map;
typedef struct _Evas_Thread_Command_Multi_Font Evas_Thread_Command_Multi_Font;
typedef struct _Evas_Thread_Command_Ector Evas_Thread_Command_Ector;
typedef struct _Evas_Thread_Command_Ector_Surface Evas_Thread_Command_Ector_Surface;
struct _Evas_Thread_Command_Rect
{
@ -390,7 +391,6 @@ struct _Evas_Thread_Command_Multi_Font
struct _Evas_Thread_Command_Ector
{
void *surface;
Ector_Renderer *r;
Eina_Array *clips;
@ -401,6 +401,11 @@ struct _Evas_Thread_Command_Ector
Eina_Bool free_it;
};
struct _Evas_Thread_Command_Ector_Surface
{
void *surface;
};
Eina_Mempool *_mp_command_rect = NULL;
Eina_Mempool *_mp_command_line = NULL;
Eina_Mempool *_mp_command_polygon = NULL;
@ -409,6 +414,7 @@ Eina_Mempool *_mp_command_font = NULL;
Eina_Mempool *_mp_command_map = NULL;
Eina_Mempool *_mp_command_multi_font = NULL;
Eina_Mempool *_mp_command_ector = NULL;
Eina_Mempool *_mp_command_ector_surface = NULL;
/*
*****
**
@ -3489,16 +3495,6 @@ static void
_draw_thread_ector_draw(void *data)
{
Evas_Thread_Command_Ector *ector = data;
RGBA_Image *surface = ector->surface;
void *pixels = evas_cache_image_pixels(&surface->cache_entry);
unsigned int w, h;
w = surface->cache_entry.w;
h = surface->cache_entry.h;
// FIXME: do not reset cairo context if not necessary
eo_do(_software_ector,
ector_cairo_software_surface_set(pixels, w, h));
eo_do(ector->r,
ector_renderer_draw(ector->render_op,
@ -3557,7 +3553,6 @@ eng_ector_renderer_draw(void *data EINA_UNUSED, void *context, void *surface, Ec
if (eina_array_count(c) == 0)
eina_array_push(c, eina_rectangle_new(clip.x, clip.y, clip.w, clip.h));
ector.surface = surface;
ector.r = eo_ref(renderer);
ector.clips = c;
ector.render_op = _evas_render_op_to_ector_rop(dc->render_op);
@ -3588,6 +3583,78 @@ eng_ector_renderer_draw(void *data EINA_UNUSED, void *context, void *surface, Ec
}
}
static void
_draw_thread_ector_surface_set(void *data)
{
Evas_Thread_Command_Ector_Surface *ector_surface = data;
RGBA_Image *surface = ector_surface->surface;
void *pixels = NULL;
unsigned int w = 0;
unsigned int h = 0;
if (surface)
{
pixels = evas_cache_image_pixels(&surface->cache_entry);
w = surface->cache_entry.w;
h = surface->cache_entry.h;
}
eo_do(_software_ector,
ector_cairo_software_surface_set(pixels, w, h));
eina_mempool_free(_mp_command_ector_surface, ector_surface);
}
static void
eng_ector_begin(void *data EINA_UNUSED, void *context EINA_UNUSED, void *surface, Eina_Bool do_async)
{
if (do_async)
{
Evas_Thread_Command_Ector_Surface *nes;
nes = eina_mempool_malloc(_mp_command_ector_surface, sizeof (Evas_Thread_Command_Ector_Surface));
if (!nes) return ;
nes->surface = surface;
evas_thread_cmd_enqueue(_draw_thread_ector_surface_set, nes);
}
else
{
RGBA_Image *sf = surface;
void *pixels = NULL;
unsigned int w = 0;
unsigned int h = 0;
pixels = evas_cache_image_pixels(&sf->cache_entry);
w = sf->cache_entry.w;
h = sf->cache_entry.h;
eo_do(_software_ector,
ector_cairo_software_surface_set(pixels, w, h));
}
}
static void
eng_ector_end(void *data EINA_UNUSED, void *context EINA_UNUSED, void *surface EINA_UNUSED, Eina_Bool do_async)
{
if (do_async)
{
Evas_Thread_Command_Ector_Surface *nes;
nes = eina_mempool_malloc(_mp_command_ector_surface, sizeof (Evas_Thread_Command_Ector_Surface));
if (!nes) return ;
nes->surface = NULL;
evas_thread_cmd_enqueue(_draw_thread_ector_surface_set, nes);
}
else
{
eo_do(_software_ector, ector_cairo_software_surface_set(NULL, 0, 0));
}
}
//------------------------------------------------//
/*
@ -3770,7 +3837,9 @@ static Evas_Func func =
NULL, // eng_texture_filter_get
NULL, // eng_texture_image_set
eng_ector_get,
eng_ector_renderer_draw
eng_ector_begin,
eng_ector_renderer_draw,
eng_ector_end
/* FUTURE software generic calls go here */
};
@ -4822,6 +4891,9 @@ module_open(Evas_Module *em)
_mp_command_ector =
eina_mempool_add("chained_mempool", "Evas_Thread_Command_Ector",
NULL, sizeof(Evas_Thread_Command_Ector), 128);
_mp_command_ector_surface =
eina_mempool_add("chained_mempool", "Evas_Thread_Command_Ector_Surface",
NULL, sizeof(Evas_Thread_Command_Ector_Surface), 128);
init_gl();
evas_common_pipe_init();