evas: refactor software engine initialisation.

This commit is contained in:
Cedric BAIL 2015-02-20 15:04:52 +01:00
parent 186a1ab11d
commit 552a38cde5
15 changed files with 17 additions and 152 deletions

View File

@ -32,7 +32,7 @@ evas_common_draw_context_cutouts_del(Cutout_Rects* rects, int idx)
}
}
void
EAPI void
evas_common_init(void)
{
evas_common_cpu_init();
@ -49,7 +49,7 @@ evas_common_init(void)
evas_common_tilebuf_init();
}
void
EAPI void
evas_common_shutdown(void)
{
evas_font_dir_cache_free();

View File

@ -1207,8 +1207,8 @@ extern "C" {
#endif
/****/
void evas_common_init (void);
void evas_common_shutdown (void);
EAPI void evas_common_init (void);
EAPI void evas_common_shutdown (void);
EAPI void evas_common_cpu_init (void);

View File

@ -59,18 +59,7 @@ _output_setup(int w,
if (!re)
return NULL;
/* if we haven't initialized - init (automatic abort if already done) */
evas_common_cpu_init();
evas_common_blend_init();
evas_common_image_init();
evas_common_convert_init();
evas_common_scale_init();
evas_common_rectangle_init();
evas_common_polygon_init();
evas_common_line_init();
evas_common_font_init();
evas_common_draw_init();
evas_common_tilebuf_init();
evas_common_init();
evas_buffer_outbuf_buf_init();

View File

@ -104,17 +104,7 @@ eng_setup(Evas *evas, void *einfo)
{
/* NB: If we have no valid output then assume we have not been
* initialized yet and call any needed common init routines */
evas_common_cpu_init();
evas_common_blend_init();
evas_common_image_init();
evas_common_convert_init();
evas_common_scale_init();
evas_common_rectangle_init();
evas_common_polygon_init();
evas_common_line_init();
evas_common_font_init();
evas_common_draw_init();
evas_common_tilebuf_init();
evas_common_init();
/* try to create a new render_engine */
if (!(re = _output_setup(info, epd->output.w, epd->output.h)))

View File

@ -35,18 +35,7 @@ _output_setup(int w, int h, int rot, int vt, int dev, int refresh)
if (!re)
return NULL;
/* if we haven't initialized - init (automatic abort if already done) */
evas_common_cpu_init();
evas_common_blend_init();
evas_common_image_init();
evas_common_convert_init();
evas_common_scale_init();
evas_common_rectangle_init();
evas_common_polygon_init();
evas_common_line_init();
evas_common_font_init();
evas_common_draw_init();
evas_common_tilebuf_init();
evas_common_init();
evas_fb_outbuf_fb_init();

View File

@ -111,18 +111,7 @@ eng_setup(Evas *eo_e, void *in)
return 0;
}
evas_common_cpu_init();
evas_common_blend_init();
evas_common_image_init();
evas_common_convert_init();
evas_common_scale_init();
evas_common_rectangle_init();
evas_common_polygon_init();
evas_common_line_init();
evas_common_font_init();
evas_common_draw_init();
evas_common_tilebuf_init();
evas_common_init();
}
else
{

View File

@ -593,17 +593,7 @@ eng_setup(Evas *eo_e, void *in)
if (!initted)
{
evas_common_cpu_init();
evas_common_blend_init();
evas_common_image_init();
evas_common_convert_init();
evas_common_scale_init();
evas_common_rectangle_init();
evas_common_polygon_init();
evas_common_line_init();
evas_common_font_init();
evas_common_draw_init();
evas_common_tilebuf_init();
evas_common_init();
glsym_evas_gl_preload_init();
}

View File

@ -327,17 +327,7 @@ eng_setup(Evas *eo_e, void *in)
e->engine.data.context = e->engine.func->context_new(e->engine.data.output);
/* if we haven't initialized - init (automatic abort if already done) */
evas_common_cpu_init();
evas_common_blend_init();
evas_common_image_init();
evas_common_convert_init();
evas_common_scale_init();
evas_common_rectangle_init();
evas_common_polygon_init();
evas_common_line_init();
evas_common_font_init();
evas_common_draw_init();
evas_common_tilebuf_init();
evas_common_init();
return 1;

View File

@ -1502,17 +1502,7 @@ eng_setup(Evas *eo_e, void *in)
if (!initted)
{
evas_common_cpu_init();
evas_common_blend_init();
evas_common_image_init();
evas_common_convert_init();
evas_common_scale_init();
evas_common_rectangle_init();
evas_common_polygon_init();
evas_common_line_init();
evas_common_font_init();
evas_common_draw_init();
evas_common_tilebuf_init();
evas_common_init();
glsym_evas_gl_preload_init();
}

View File

@ -108,17 +108,7 @@ _output_setup(int w, int h)
flipBuffer(re->context, MAX_BUFFERS - 1);
/* if we haven't initialized - init (automatic abort if already done) */
evas_common_cpu_init();
evas_common_blend_init();
evas_common_image_init();
evas_common_convert_init();
evas_common_scale_init();
evas_common_rectangle_init();
evas_common_polygon_init();
evas_common_line_init();
evas_common_font_init();
evas_common_draw_init();
evas_common_tilebuf_init();
evas_common_init();
re->tb = evas_common_tilebuf_new(w, h);

View File

@ -34,18 +34,7 @@ _output_setup(int width,
return NULL;
/* if we haven't initialized - init (automatic abort if already done) */
evas_common_cpu_init();
evas_common_blend_init();
evas_common_image_init();
evas_common_convert_init();
evas_common_scale_init();
evas_common_rectangle_init();
evas_common_polygon_init();
evas_common_line_init();
evas_common_font_init();
evas_common_draw_init();
evas_common_tilebuf_init();
evas_common_init();
evas_software_ddraw_outbuf_init();

View File

@ -34,18 +34,7 @@ _output_setup(int width,
return NULL;
/* if we haven't initialized - init (automatic abort if already done) */
evas_common_cpu_init();
evas_common_blend_init();
evas_common_image_init();
evas_common_convert_init();
evas_common_scale_init();
evas_common_rectangle_init();
evas_common_polygon_init();
evas_common_line_init();
evas_common_font_init();
evas_common_draw_init();
evas_common_tilebuf_init();
evas_common_init();
evas_software_gdi_outbuf_init();

View File

@ -435,17 +435,7 @@ eng_setup(Evas *eo_e, void *in)
if (!e->engine.data.output)
{
/* if we haven't initialized - init (automatic abort if already done) */
evas_common_cpu_init();
evas_common_blend_init();
evas_common_image_init();
evas_common_convert_init();
evas_common_scale_init();
evas_common_rectangle_init();
evas_common_polygon_init();
evas_common_line_init();
evas_common_font_init();
evas_common_draw_init();
evas_common_tilebuf_init();
evas_common_init();
#ifdef BUILD_ENGINE_SOFTWARE_XLIB
if (info->info.backend == EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XLIB)

View File

@ -593,17 +593,7 @@ eng_setup(Evas *evas, void *info)
/* if we have not initialize gl & evas, do it */
if (!initted)
{
evas_common_cpu_init();
evas_common_blend_init();
evas_common_image_init();
evas_common_convert_init();
evas_common_scale_init();
evas_common_rectangle_init();
evas_common_polygon_init();
evas_common_line_init();
evas_common_font_init();
evas_common_draw_init();
evas_common_tilebuf_init();
evas_common_init();
glsym_evas_gl_preload_init();
}

View File

@ -127,17 +127,7 @@ eng_setup(Evas *eo_evas, void *einfo)
/* NB: If we have no valid output then assume we have not been
* initialized yet and call any needed common init routines */
evas_common_cpu_init();
evas_common_blend_init();
evas_common_image_init();
evas_common_convert_init();
evas_common_scale_init();
evas_common_rectangle_init();
evas_common_polygon_init();
evas_common_line_init();
evas_common_font_init();
evas_common_draw_init();
evas_common_tilebuf_init();
evas_common_init();
if (try_swap == -1)
{