cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e6b4878a9e348b6fdf6112ba2ef359e63ccbd09c
commit e6b4878a9e348b6fdf6112ba2ef359e63ccbd09c Author: Cedric BAIL <[email protected]> Date: Fri Aug 25 10:48:37 2017 -0700 evas: follow all other engines convention and use ORD macro. --- src/modules/evas/engines/drm/evas_engine.c | 13 +++++++------ src/modules/evas/engines/eglfs/evas_engine.c | 15 ++++++++------- src/modules/evas/engines/gl_drm/evas_engine.c | 23 ++++++++++++----------- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/src/modules/evas/engines/drm/evas_engine.c b/src/modules/evas/engines/drm/evas_engine.c index 53fc902fb4..6a4c7eedab 100644 --- a/src/modules/evas/engines/drm/evas_engine.c +++ b/src/modules/evas/engines/drm/evas_engine.c @@ -233,12 +233,13 @@ module_open(Evas_Module *em) func = pfunc; /* override the methods we provide */ - EVAS_API_OVERRIDE(output_info_setup, &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_); +#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_) + ORD(output_info_setup); + ORD(output_setup); + ORD(output_update); + ORD(output_free); + ORD(image_plane_assign); + ORD(image_plane_release); /* advertise our engine functions */ em->functions = (void *)(&func); diff --git a/src/modules/evas/engines/eglfs/evas_engine.c b/src/modules/evas/engines/eglfs/evas_engine.c index e86155b381..b951bab732 100644 --- a/src/modules/evas/engines/eglfs/evas_engine.c +++ b/src/modules/evas/engines/eglfs/evas_engine.c @@ -1111,13 +1111,14 @@ module_open(Evas_Module *em) func = pfunc; /* now to override methods */ - EVAS_API_OVERRIDE(output_info, &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_); - EVAS_API_OVERRIDE(image_native_set, &func, eng_); +#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_) + ORD(output_info); + ORD(output_setup); + ORD(output_update); + ORD(canvas_alpha_get); + ORD(output_free); + ORD(output_dump); + ORD(image_native_set); setenv("EGL_PLATFORM", "fbdev", 1); diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c b/src/modules/evas/engines/gl_drm/evas_engine.c index 61e5bb8f94..2072284550 100644 --- a/src/modules/evas/engines/gl_drm/evas_engine.c +++ b/src/modules/evas/engines/gl_drm/evas_engine.c @@ -1473,17 +1473,18 @@ module_open(Evas_Module *em) func = pfunc; /* now to override methods */ - EVAS_API_OVERRIDE(output_info_setup, &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_); - EVAS_API_OVERRIDE(image_native_set, &func, eng_); - EVAS_API_OVERRIDE(image_native_init, &func, eng_); - EVAS_API_OVERRIDE(image_native_shutdown, &func, eng_); - EVAS_API_OVERRIDE(image_plane_assign, &func, eng_); - EVAS_API_OVERRIDE(image_plane_release, &func, eng_); +#define ORD(f) EVAS_API_OVERRIDE(f, &func, eng_) + ORD(output_info_setup); + ORD(output_setup); + ORD(output_update); + ORD(canvas_alpha_get); + ORD(output_free); + ORD(output_dump); + ORD(image_native_set); + ORD(image_native_init); + ORD(image_native_shutdown); + ORD(image_plane_assign); + ORD(image_plane_release); /* Mesa's EGL driver loads wayland egl by default. (called by eglGetProcaddr() ) * implicit env set (EGL_PLATFORM=drm) prevent that. */ --
