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

evas: all this function (info, setup and update) are really output related.

This commit is contained in:
Cedric BAIL 2017-08-25 10:48:09 -07:00
parent 8017fab100
commit 1e2bbf8fea
17 changed files with 122 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1038,13 +1038,13 @@ evas_output_method_set(Evas *eo_e, int render_method)
e->engine.module = em;
evas_module_ref(em);
/* get the engine info struct */
if (e->engine.func->info)
if (e->engine.func->output_info)
{
Efl_Canvas_Output *output;
Eina_List *l;
EINA_LIST_FOREACH(e->outputs, l, output)
if (!output->info) output->info = e->engine.func->info();
if (!output->info) output->info = e->engine.func->output_info();
}
// Wayland/drm already handles seats.

16
src/lib/evas/canvas/evas_out.c
View File

@ -38,9 +38,9 @@ efl_canvas_output_add(Evas *canvas)
// The engine is already initialized, use it
// right away to setup the info structure
if (e->engine.func->info)
if (e->engine.func->output_info)
{
r->info = e->engine.func->info();
r->info = e->engine.func->output_info();
}
return r;
@ -62,7 +62,7 @@ efl_canvas_output_del(Efl_Canvas_Output *output)
output->ector);
e->engine.func->output_free(_evas_engine_context(e),
output->output);
e->engine.func->info_free(output->info);
e->engine.func->output_info_free(output->info);
}
e->outputs = eina_list_remove(e->outputs, output);
@ -113,10 +113,10 @@ efl_canvas_output_engine_info_set(Efl_Canvas_Output *output,
if (output->output)
{
if (e->engine.func->update)
if (e->engine.func->output_update)
{
e->engine.func->update(_evas_engine_context(e), output->output, info,
e->output.w, e->output.h);
e->engine.func->output_update(_evas_engine_context(e), output->output, info,
e->output.w, e->output.h);
}
else
{
@ -136,8 +136,8 @@ efl_canvas_output_engine_info_set(Efl_Canvas_Output *output,
}
setup:
output->output = e->engine.func->setup(_evas_engine_context(e), info,
e->output.w, e->output.h);
output->output = e->engine.func->output_setup(_evas_engine_context(e), info,
e->output.w, e->output.h);
}
return !!output->output;

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

@ -1393,10 +1393,10 @@ struct _Evas_Object_Func
struct _Evas_Func
{
void *(*info) (void);
void (*info_free) (void *info);
void *(*setup) (void *engine, void *info, unsigned int w, unsigned int h);
int (*update) (void *engine, void *data, void *info, unsigned int w, unsigned int h);
void *(*output_info) (void);
void (*output_info_free) (void *info);
void *(*output_setup) (void *engine, void *info, unsigned int w, unsigned int h);
int (*output_update) (void *engine, void *data, void *info, unsigned int w, unsigned int h);
void (*output_free) (void *engine, void *data);
void (*output_resize) (void *engine, void *data, int w, int h);

16
src/modules/evas/engines/buffer/evas_engine.c
View File

@ -22,8 +22,8 @@ typedef Render_Output_Software_Generic Render_Engine;
/* prototypes we will use here */
static void *_output_setup(int w, int h, void *dest_buffer, int dest_buffer_row_bytes, int depth_type, int use_color_key, int alpha_threshold, int color_key_r, int color_key_g, int color_key_b, void *(*new_update_region) (int x, int y, int w, int h, int *row_bytes), void (*free_update_region) (int x, int y, int w, int h, void *data), void *(*switch_buffer) (void *data, void *dest_buffer), void *switch_data);
static void *eng_info(void);
static void eng_info_free(void *info);
static void *eng_output_info(void);
static void eng_output_info_free(void *info);
static void eng_output_free(void *engine EINA_UNUSED, void *data);
/* internal engine routines */
@ -108,7 +108,7 @@ _output_setup(int w,
/* engine api this module provides */
static void *
eng_info(void)
eng_output_info(void)
{
Evas_Engine_Info_Buffer *info;
info = calloc(1, sizeof(Evas_Engine_Info_Buffer));
@ -119,7 +119,7 @@ eng_info(void)
}
static void
eng_info_free(void *info)
eng_output_info_free(void *info)
{
Evas_Engine_Info_Buffer *in;
in = (Evas_Engine_Info_Buffer *)info;
@ -127,7 +127,7 @@ eng_info_free(void *info)
}
static void *
eng_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
eng_output_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
{
Evas_Engine_Info_Buffer *info = in;
@ -190,9 +190,9 @@ module_open(Evas_Module *em)
func = pfunc;
/* now to override methods */
#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
ORD(info);
ORD(info_free);
ORD(setup);
ORD(output_info);
ORD(output_info_free);
ORD(output_setup);
ORD(canvas_alpha_get);
ORD(output_free);
/* now advertise out own api */

16
src/modules/evas/engines/drm/evas_engine.c
View File

@ -58,7 +58,7 @@ err:
}
static void *
eng_info(void)
eng_output_info(void)
{
Evas_Engine_Info_Drm *info;
@ -74,7 +74,7 @@ eng_info(void)
}
static void
eng_info_free(void *einfo)
eng_output_info_free(void *einfo)
{
Evas_Engine_Info_Drm *info;
@ -84,7 +84,7 @@ eng_info_free(void *einfo)
}
static void *
eng_setup(void *engine EINA_UNUSED, void *einfo, unsigned int w, unsigned int h)
eng_output_setup(void *engine EINA_UNUSED, void *einfo, unsigned int w, unsigned int h)
{
Evas_Engine_Info_Drm *info = einfo;
@ -92,7 +92,7 @@ eng_setup(void *engine EINA_UNUSED, void *einfo, unsigned int w, unsigned int h)
}
static int
eng_update(void *engine EINA_UNUSED, void *data, void *einfo, unsigned int w, unsigned int h)
eng_output_update(void *engine EINA_UNUSED, void *data, void *einfo, unsigned int w, unsigned int h)
{
Evas_Engine_Info_Drm *info = einfo;
Render_Engine *re = data;
@ -251,10 +251,10 @@ module_open(Evas_Module *em)
func = pfunc;
/* override the methods we provide */
EVAS_API_OVERRIDE(info, &func, eng_);
EVAS_API_OVERRIDE(info_free, &func, eng_);
EVAS_API_OVERRIDE(setup, &func, eng_);
EVAS_API_OVERRIDE(update, &func, eng_);
EVAS_API_OVERRIDE(output_info, &func, eng_);
EVAS_API_OVERRIDE(output_info_free, &func, eng_);
EVAS_API_OVERRIDE(output_setup, &func, eng_);
EVAS_API_OVERRIDE(output_update, &func, eng_);
EVAS_API_OVERRIDE(output_free, &func, eng_);
EVAS_API_OVERRIDE(image_plane_assign, &func, eng_);
EVAS_API_OVERRIDE(image_plane_release, &func, eng_);

16
src/modules/evas/engines/eglfs/evas_engine.c
View File

@ -671,7 +671,7 @@ _native_cb_free(void *image)
/* engine specific override functions */
static void *
eng_info(void)
eng_output_info(void)
{
Evas_Engine_Info_Eglfs *info;
@ -686,7 +686,7 @@ eng_info(void)
}
static void
eng_info_free(void *in)
eng_output_info_free(void *in)
{
Evas_Engine_Info_Eglfs *info;
@ -695,7 +695,7 @@ eng_info_free(void *in)
}
static void *
eng_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
eng_output_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
{
Evas_Engine_Info_Eglfs *info = in;
Render_Engine *re = NULL;
@ -770,7 +770,7 @@ eng_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
}
static int
eng_update(void *engine EINA_UNUSED, void *data, void *info, unsigned int w, unsigned int h)
eng_output_update(void *engine EINA_UNUSED, void *data, void *info, unsigned int w, unsigned int h)
{
Render_Engine *re = data;
@ -1127,10 +1127,10 @@ module_open(Evas_Module *em)
func = pfunc;
/* now to override methods */
EVAS_API_OVERRIDE(info, &func, eng_);
EVAS_API_OVERRIDE(info_free, &func, eng_);
EVAS_API_OVERRIDE(setup, &func, eng_);
EVAS_API_OVERRIDE(update, &func, eng_);
EVAS_API_OVERRIDE(output_info, &func, eng_);
EVAS_API_OVERRIDE(output_info_free, &func, eng_);
EVAS_API_OVERRIDE(output_setup, &func, eng_);
EVAS_API_OVERRIDE(output_update, &func, eng_);
EVAS_API_OVERRIDE(canvas_alpha_get, &func, eng_);
EVAS_API_OVERRIDE(output_free, &func, eng_);
EVAS_API_OVERRIDE(output_dump, &func, eng_);

12
src/modules/evas/engines/fb/evas_engine.c
View File

@ -62,7 +62,7 @@ _output_setup(int w, int h, int rot, int vt, int dev, int refresh)
/* engine api this module provides */
static void *
eng_info(void)
eng_output_info(void)
{
Evas_Engine_Info_FB *info;
info = calloc(1, sizeof(Evas_Engine_Info_FB));
@ -73,7 +73,7 @@ eng_info(void)
}
static void
eng_info_free(void *info)
eng_output_info_free(void *info)
{
Evas_Engine_Info_FB *in;
in = (Evas_Engine_Info_FB *)info;
@ -81,7 +81,7 @@ eng_info_free(void *info)
}
static void *
eng_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
eng_output_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
{
Evas_Engine_Info_FB *info = in;
@ -135,9 +135,9 @@ module_open(Evas_Module *em)
func = pfunc;
/* now to override methods */
#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
ORD(info);
ORD(info_free);
ORD(setup);
ORD(output_info);
ORD(output_info_free);
ORD(output_setup);
ORD(canvas_alpha_get);
ORD(output_free);
/* now advertise out own api */

24
src/modules/evas/engines/gl_cocoa/evas_engine.c
View File

@ -127,7 +127,7 @@ static const EVGL_Interface evgl_funcs =
static void *
eng_info(void)
eng_output_info(void)
{
Evas_Engine_Info_GL_Cocoa *info;
@ -142,14 +142,14 @@ eng_info(void)
}
static void
eng_info_free(void *info)
eng_output_info_free(void *info)
{
Evas_Engine_Info_GL_Cocoa *const in = info;
free(in);
}
static void *
eng_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
eng_output_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
{
Evas_Engine_Info_GL_Cocoa *const info = in;
Render_Engine *re;
@ -217,11 +217,11 @@ err:
}
static int
eng_update(void *engine EINA_UNUSED,
void *data EINA_UNUSED,
void *info EINA_UNUSED,
unsigned int w EINA_UNUSED,
unsigned int h EINA_UNUSED)
eng_output_update(void *engine EINA_UNUSED,
void *data EINA_UNUSED,
void *info EINA_UNUSED,
unsigned int w EINA_UNUSED,
unsigned int h EINA_UNUSED)
{
//Evas_Engine_Info_GL_Cocoa *const info = info;
//Render_Engine *re = data;
@ -306,10 +306,10 @@ module_open(Evas_Module *em)
/* now to override methods */
#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
ORD(info);
ORD(info_free);
ORD(setup);
ORD(update);
ORD(output_info);
ORD(output_info_free);
ORD(output_setup);
ORD(output_update);
ORD(canvas_alpha_get);
ORD(output_free);

16
src/modules/evas/engines/gl_drm/evas_engine.c
View File

@ -892,7 +892,7 @@ _native_cb_free(void *image)
/* engine specific override functions */
static void *
eng_info(void)
eng_output_info(void)
{
Evas_Engine_Info_GL_Drm *info;
@ -907,7 +907,7 @@ eng_info(void)
}
static void
eng_info_free(void *in)
eng_output_info_free(void *in)
{
Evas_Engine_Info_GL_Drm *info;
@ -936,7 +936,7 @@ _eng_merge_mode_get(void)
}
static void *
eng_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
eng_output_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
{
Evas_Engine_Info_GL_Drm *info = in;
Render_Engine *re = NULL;
@ -1014,7 +1014,7 @@ eng_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
}
static int
eng_update(void *engine EINA_UNUSED, void *data, void *in, unsigned int w, unsigned int h)
eng_output_update(void *engine EINA_UNUSED, void *data, void *in, unsigned int w, unsigned int h)
{
Evas_Engine_Info_GL_Drm *info = (Evas_Engine_Info_GL_Drm *)in;
Render_Engine *re = data;
@ -1489,10 +1489,10 @@ module_open(Evas_Module *em)
func = pfunc;
/* now to override methods */
EVAS_API_OVERRIDE(info, &func, eng_);
EVAS_API_OVERRIDE(info_free, &func, eng_);
EVAS_API_OVERRIDE(setup, &func, eng_);
EVAS_API_OVERRIDE(update, &func, eng_);
EVAS_API_OVERRIDE(output_info, &func, eng_);
EVAS_API_OVERRIDE(output_info_free, &func, eng_);
EVAS_API_OVERRIDE(output_setup, &func, eng_);
EVAS_API_OVERRIDE(output_update, &func, eng_);
EVAS_API_OVERRIDE(canvas_alpha_get, &func, eng_);
EVAS_API_OVERRIDE(output_free, &func, eng_);
EVAS_API_OVERRIDE(output_dump, &func, eng_);

12
src/modules/evas/engines/gl_sdl/evas_engine.c
View File

@ -268,7 +268,7 @@ static const EVGL_Interface evgl_funcs =
static void *
eng_info(void)
eng_output_info(void)
{
Evas_Engine_Info_GL_SDL *info;
@ -279,7 +279,7 @@ eng_info(void)
}
static void
eng_info_free(void *info)
eng_output_info_free(void *info)
{
Evas_Engine_Info_GL_SDL *in;
in = (Evas_Engine_Info_GL_SDL *)info;
@ -287,7 +287,7 @@ eng_info_free(void *info)
}
static void *
eng_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
eng_output_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
{
Render_Engine *re = NULL;
Outbuf *ob = NULL;
@ -400,9 +400,9 @@ module_open(Evas_Module *em)
func = pfunc;
/* now to override methods */
#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
ORD(info);
ORD(info_free);
ORD(setup);
ORD(output_info);
ORD(output_info_free);
ORD(output_setup);
ORD(canvas_alpha_get);
ORD(output_free);
ORD(output_dump);

16
src/modules/evas/engines/gl_x11/evas_engine.c
View File

@ -1550,7 +1550,7 @@ int _evas_engine_GL_X11_log_dom = -1;
static Evas_Func func, pfunc;
static void *
eng_info(void)
eng_output_info(void)
{
Evas_Engine_Info_GL_X11 *info;
@ -1564,7 +1564,7 @@ eng_info(void)
}
static void
eng_info_free(void *info)
eng_output_info_free(void *info)
{
Evas_Engine_Info_GL_X11 *in;
// dont free! why bother? its not worth it
@ -1589,7 +1589,7 @@ _re_winfree(Render_Engine *re)
}
static void *
eng_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
eng_output_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
{
Evas_Engine_Info_GL_X11 *info = in;
Render_Engine *re = NULL;
@ -1715,7 +1715,7 @@ eng_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
}
static int
eng_update(void *engine EINA_UNUSED, void *data, void *in, unsigned int w, unsigned int h)
eng_output_update(void *engine EINA_UNUSED, void *data, void *in, unsigned int w, unsigned int h)
{
Evas_Engine_Info_GL_X11 *info = in;
Render_Engine *re = data;
@ -3044,10 +3044,10 @@ module_open(Evas_Module *em)
func = pfunc;
/* now to override methods */
#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
ORD(info);
ORD(info_free);
ORD(setup);
ORD(update);
ORD(output_info);
ORD(output_info_free);
ORD(output_setup);
ORD(output_update);
ORD(canvas_alpha_get);
ORD(output_free);
ORD(output_dump);

12
src/modules/evas/engines/psl1ght/evas_engine.c
View File

@ -99,7 +99,7 @@ _output_setup(int w, int h)
/* engine api this module provides */
static void *
eng_info(void)
eng_output_info(void)
{
Evas_Engine_Info_PSL1GHT *info;
@ -115,7 +115,7 @@ eng_info(void)
}
static void
eng_info_free(void *info)
eng_output_info_free(void *info)
{
Evas_Engine_Info_PSL1GHT *in;
@ -125,7 +125,7 @@ eng_info_free(void *info)
}
static void *
eng_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
eng_output_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
{
Evas_Engine_Info_PSL1GHT *info = in;
@ -420,9 +420,9 @@ module_open(Evas_Module *em)
func = pfunc;
/* now to override methods */
#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
ORD(info);
ORD(info_free);
ORD(setup);
ORD(output_info);
ORD(output_info_free);
ORD(output_setup);
ORD(canvas_alpha_get);
ORD(output_free);
ORD(output_resize);

12
src/modules/evas/engines/software_ddraw/evas_engine.c
View File

@ -67,7 +67,7 @@ _output_setup(int width,
/* engine api this module provides */
static void *
eng_info(void)
eng_output_info(void)
{
Evas_Engine_Info_Software_DDraw *info;
@ -79,7 +79,7 @@ eng_info(void)
}
static void
eng_info_free(void *info)
eng_output_info_free(void *info)
{
Evas_Engine_Info_Software_DDraw *in;
@ -88,7 +88,7 @@ eng_info_free(void *info)
}
static void *
eng_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
eng_output_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
{
Evas_Engine_Info_Software_DDraw *info = in;
@ -136,9 +136,9 @@ module_open(Evas_Module *em)
func = pfunc;
/* now to override methods */
#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
ORD(info);
ORD(info_free);
ORD(setup);
ORD(output_info);
ORD(output_info_free);
ORD(output_setup);
ORD(canvas_alpha_get);
ORD(output_free);
/* now advertise out own api */

16
src/modules/evas/engines/software_gdi/evas_engine.c
View File

@ -73,7 +73,7 @@ _output_setup(int width,
/* engine api this module provides */
static void *
eng_info(void)
eng_output_info(void)
{
Evas_Engine_Info_Software_Gdi *info;
info = calloc(1, sizeof(Evas_Engine_Info_Software_Gdi));
@ -83,7 +83,7 @@ eng_info(void)
}
static void
eng_info_free(void *info)
eng_output_info_free(void *info)
{
Evas_Engine_Info_Software_Gdi *in;
in = (Evas_Engine_Info_Software_Gdi *)info;
@ -91,7 +91,7 @@ eng_info_free(void *info)
}
static void *
eng_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
eng_output_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
{
Evas_Engine_Info_Software_Gdi *info;
@ -107,7 +107,7 @@ eng_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
}
static int
eng_update(void *engine EINA_UNUSED, void *data, void *in, unsigned int w, unsigned int h)
eng_output_update(void *engine EINA_UNUSED, void *data, void *in, unsigned int w, unsigned int h)
{
Evas_Engine_Info_Software_Gdi *info;
Render_Engine *re = data;
@ -173,10 +173,10 @@ module_open(Evas_Module *em)
func = pfunc;
/* now to override methods */
#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
ORD(info);
ORD(info_free);
ORD(setup);
ORD(update);
ORD(output_info);
ORD(output_info_free);
ORD(output_setup);
ORD(output_update);
ORD(canvas_alpha_get);
ORD(output_free);
/* now advertise out own api */

16
src/modules/evas/engines/software_x11/evas_engine.c
View File

@ -232,7 +232,7 @@ _symbols(void)
/* engine api this module provides */
static void *
eng_info(void)
eng_output_info(void)
{
Evas_Engine_Info_Software_X11 *info;
@ -251,7 +251,7 @@ eng_info(void)
}
static void
eng_info_free(void *info)
eng_output_info_free(void *info)
{
Evas_Engine_Info_Software_X11 *in;
@ -260,7 +260,7 @@ eng_info_free(void *info)
}
static void *
eng_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
eng_output_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
{
Evas_Engine_Info_Software_X11 *info = in;
Render_Engine *re = NULL;
@ -311,7 +311,7 @@ eng_setup(void *engine EINA_UNUSED, void *in, unsigned int w, unsigned int h)
}
static int
eng_update(void *engine EINA_UNUSED, void *data, void *in, unsigned int w, unsigned int h)
eng_output_update(void *engine EINA_UNUSED, void *data, void *in, unsigned int w, unsigned int h)
{
Evas_Engine_Info_Software_X11 *info = in;
Render_Engine *re = data;
@ -590,10 +590,10 @@ module_open(Evas_Module *em)
/* now to override methods */
#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
ORD(info);
ORD(info_free);
ORD(setup);
ORD(update);
ORD(output_info);
ORD(output_info_free);
ORD(output_setup);
ORD(output_update);
ORD(canvas_alpha_get);
ORD(output_free);
ORD(image_native_init);

16
src/modules/evas/engines/wayland_egl/evas_engine.c
View File

@ -503,7 +503,7 @@ static const EVGL_Interface evgl_funcs =
/* engine functions */
static void *
eng_info(void)
eng_output_info(void)
{
Evas_Engine_Info_Wayland *info;
@ -518,7 +518,7 @@ eng_info(void)
}
static void
eng_info_free(Evas *evas EINA_UNUSED, void *info)
eng_output_info_free(Evas *evas EINA_UNUSED, void *info)
{
Evas_Engine_Info_Wayland *inf;
@ -581,7 +581,7 @@ _eng_merge_mode_get(void)
}
static void *
eng_setup(void *engine EINA_UNUSED, void *info, unsigned int w, unsigned int h)
eng_output_setup(void *engine EINA_UNUSED, void *info, unsigned int w, unsigned int h)
{
Evas_Engine_Info_Wayland *inf = info;
Render_Engine *re;
@ -658,7 +658,7 @@ ob_err:
}
static int
eng_update(void *engine EINA_UNUSED, void *data, void *info, unsigned int w, unsigned int h)
eng_output_update(void *engine EINA_UNUSED, void *data, void *info, unsigned int w, unsigned int h)
{
Evas_Engine_Info_Wayland *inf = info;
struct wl_surface *wls;
@ -1430,10 +1430,10 @@ module_open(Evas_Module *em)
#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
ORD(info);
ORD(info_free);
ORD(setup);
ORD(update);
ORD(output_info);
ORD(output_info_free);
ORD(output_setup);
ORD(output_update);
ORD(canvas_alpha_get);
ORD(output_free);

16
src/modules/evas/engines/wayland_shm/evas_engine.c
View File

@ -103,7 +103,7 @@ _symbols(void)
/* ENGINE API FUNCTIONS WE PROVIDE */
static void *
eng_info(void)
eng_output_info(void)
{
Evas_Engine_Info_Wayland *einfo;
@ -122,7 +122,7 @@ eng_info(void)
}
static void
eng_info_free(void *info)
eng_output_info_free(void *info)
{
Evas_Engine_Info_Wayland *einfo;
@ -134,7 +134,7 @@ eng_info_free(void *info)
}
static void *
eng_setup(void *engine EINA_UNUSED, void *info, unsigned int w, unsigned int h)
eng_output_setup(void *engine EINA_UNUSED, void *info, unsigned int w, unsigned int h)
{
Evas_Engine_Info_Wayland *einfo = info;
@ -171,7 +171,7 @@ eng_output_resize(void *engine EINA_UNUSED, void *data, int w, int h)
}
static int
eng_update(void *engine, void *data, void *info, unsigned int w, unsigned int h)
eng_output_update(void *engine, void *data, void *info, unsigned int w, unsigned int h)
{
Evas_Engine_Info_Wayland *einfo = info;
Render_Engine *re = data;
@ -360,10 +360,10 @@ module_open(Evas_Module *em)
/* override engine specific functions */
#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_)
ORD(info);
ORD(info_free);
ORD(setup);
ORD(update);
ORD(output_info);
ORD(output_info_free);
ORD(output_setup);
ORD(output_update);
ORD(output_free);
ORD(output_resize);
ORD(image_native_set);