diff options
| author | Chris Michael <cpmichael@osg.samsung.com> | 2016-03-18 08:50:54 -0400 |
|---|---|---|
| committer | Chris Michael <cpmichael@osg.samsung.com> | 2016-03-18 08:50:54 -0400 |
| commit | 67db4d7c1a37a4f45c7020580d2c7c13b0457771 (patch) | |
| tree | b5a989ce1530ffb402f3f5de8dc6ec5040493ad4 | |
| parent | e64c30caab0e9efe8636e1bb3702ef3e75339564 (diff) | |
| download | efl-67db4d7c1a37a4f45c7020580d2c7c13b0457771.tar.gz | |
evas-wayland-egl: Override image_native init and shutdown functions
If we are going to define native_init & native_shutdown functions,
then we should probably be using them ;) Also, as this is a wayland
egl engine, we can return from native_init based on
eglQueryWaylandBufferWL
ref 20b4d9dd6adb88f9dd0cd51fa849f0c360432279
@fix
Signed-off-by: Chris Michael <cpmichael@osg.samsung.com>
| -rw-r--r-- | src/modules/evas/engines/wayland_egl/evas_engine.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c index a33c904095..bbfe7389e2 100644 --- a/src/modules/evas/engines/wayland_egl/evas_engine.c +++ b/src/modules/evas/engines/wayland_egl/evas_engine.c @@ -1003,8 +1003,11 @@ eng_image_native_init(void *data EINA_UNUSED, Evas_Native_Surface_Type type) #endif case EVAS_NATIVE_SURFACE_EVASGL: case EVAS_NATIVE_SURFACE_OPENGL: - case EVAS_NATIVE_SURFACE_WL: return 1; +#if defined(GL_GLES) && defined(HAVE_WAYLAND) + case EVAS_NATIVE_SURFACE_WL: + return (glsym_eglQueryWaylandBufferWL != NULL) ? 1 : 0; +#endif default: ERR("Native surface type %d not supported!", type); return 0; @@ -1023,7 +1026,9 @@ eng_image_native_shutdown(void *data EINA_UNUSED, Evas_Native_Surface_Type type) #endif case EVAS_NATIVE_SURFACE_EVASGL: case EVAS_NATIVE_SURFACE_OPENGL: +#if defined(GL_GLES) && defined(HAVE_WAYLAND) case EVAS_NATIVE_SURFACE_WL: +#endif return; default: ERR("Native surface type %d not supported!", type); @@ -1423,6 +1428,8 @@ module_open(Evas_Module *em) ORD(output_dump); ORD(image_native_set); + ORD(image_native_init); + ORD(image_native_shutdown); gl_symbols(); |