summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChris Michael <cpmichael@osg.samsung.com>2016-03-18 08:50:54 -0400
committerChris Michael <cpmichael@osg.samsung.com>2016-03-18 08:50:54 -0400
commit67db4d7c1a37a4f45c7020580d2c7c13b0457771 (patch)
treeb5a989ce1530ffb402f3f5de8dc6ec5040493ad4 /src
parente64c30caab0e9efe8636e1bb3702ef3e75339564 (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/modules/evas/engines/wayland_egl/evas_engine.c9
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)
1003#endif 1003#endif
1004 case EVAS_NATIVE_SURFACE_EVASGL: 1004 case EVAS_NATIVE_SURFACE_EVASGL:
1005 case EVAS_NATIVE_SURFACE_OPENGL: 1005 case EVAS_NATIVE_SURFACE_OPENGL:
1006 case EVAS_NATIVE_SURFACE_WL:
1007 return 1; 1006 return 1;
1007#if defined(GL_GLES) && defined(HAVE_WAYLAND)
1008 case EVAS_NATIVE_SURFACE_WL:
1009 return (glsym_eglQueryWaylandBufferWL != NULL) ? 1 : 0;
1010#endif
1008 default: 1011 default:
1009 ERR("Native surface type %d not supported!", type); 1012 ERR("Native surface type %d not supported!", type);
1010 return 0; 1013 return 0;
@@ -1023,7 +1026,9 @@ eng_image_native_shutdown(void *data EINA_UNUSED, Evas_Native_Surface_Type type)
1023#endif 1026#endif
1024 case EVAS_NATIVE_SURFACE_EVASGL: 1027 case EVAS_NATIVE_SURFACE_EVASGL:
1025 case EVAS_NATIVE_SURFACE_OPENGL: 1028 case EVAS_NATIVE_SURFACE_OPENGL:
1029#if defined(GL_GLES) && defined(HAVE_WAYLAND)
1026 case EVAS_NATIVE_SURFACE_WL: 1030 case EVAS_NATIVE_SURFACE_WL:
1031#endif
1027 return; 1032 return;
1028 default: 1033 default:
1029 ERR("Native surface type %d not supported!", type); 1034 ERR("Native surface type %d not supported!", type);
@@ -1423,6 +1428,8 @@ module_open(Evas_Module *em)
1423 ORD(output_dump); 1428 ORD(output_dump);
1424 1429
1425 ORD(image_native_set); 1430 ORD(image_native_set);
1431 ORD(image_native_init);
1432 ORD(image_native_shutdown);
1426 1433
1427 gl_symbols(); 1434 gl_symbols();
1428 1435