From 720f7996aeb50ce3516de723758dfa2cb633b1c6 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Tue, 28 Feb 2012 21:57:59 +0000 Subject: [PATCH] Evas (wayland): Comment out eglTerminate (is causing hangs when running under the current weston compositor). SVN revision: 68518 --- legacy/evas/src/modules/engines/wayland_egl/evas_engine.c | 1 - legacy/evas/src/modules/engines/wayland_egl/evas_wl_main.c | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/legacy/evas/src/modules/engines/wayland_egl/evas_engine.c b/legacy/evas/src/modules/engines/wayland_egl/evas_engine.c index d2a6a0d..a77b213 100644 --- a/legacy/evas/src/modules/engines/wayland_egl/evas_engine.c +++ b/legacy/evas/src/modules/engines/wayland_egl/evas_engine.c @@ -25,7 +25,6 @@ struct _Render_Engine int end; int w, h; int vsync; - }; struct _Render_Engine_GL_Surface diff --git a/legacy/evas/src/modules/engines/wayland_egl/evas_wl_main.c b/legacy/evas/src/modules/engines/wayland_egl/evas_wl_main.c index 537fcc6..60a2371 100644 --- a/legacy/evas/src/modules/engines/wayland_egl/evas_wl_main.c +++ b/legacy/evas/src/modules/engines/wayland_egl/evas_wl_main.c @@ -217,7 +217,9 @@ eng_window_free(Evas_GL_Wl_Window *gw) { if (context) eglDestroyContext(gw->egl_disp, context); context = EGL_NO_CONTEXT; - eglTerminate(gw->egl_disp); + /* NB: This is causing an unknown hang when we run elm apps as + * wayland clients inside the weston compositor */ + /* eglTerminate(gw->egl_disp); */ eglReleaseThread(); } free(gw); -- 2.7.4