discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=2047ca3bfe3565bdd6d8282279bcadb32f8d4ccd

commit 2047ca3bfe3565bdd6d8282279bcadb32f8d4ccd
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Fri Aug 11 18:48:53 2017 -0400

    handle case where eglBindWaylandDisplay fails during wl init
---
 src/bin/e_comp_wl.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 09462e420..4f359b76d 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2856,10 +2856,9 @@ _e_comp_wl_gl_init(void)
    evas_gl_make_current(e_comp_wl->wl.gl, e_comp_wl->wl.glsfc, 
e_comp_wl->wl.glctx);
    e_comp_wl->wl.glapi = evas_gl_context_api_get(e_comp_wl->wl.gl, 
e_comp_wl->wl.glctx);
    if (e_comp_wl->wl.glapi->evasglBindWaylandDisplay)
-     {
-        e_util_env_set("ELM_ACCEL", "gl");
-        e_comp->gl = 
e_comp_wl->wl.glapi->evasglBindWaylandDisplay(e_comp_wl->wl.gl, 
e_comp_wl->wl.disp);
-     }
+     e_comp->gl = 
e_comp_wl->wl.glapi->evasglBindWaylandDisplay(e_comp_wl->wl.gl, 
e_comp_wl->wl.disp);
+   if (e_comp->gl)
+     e_util_env_set("ELM_ACCEL", "gl");
    else
      _e_comp_wl_gl_shutdown();
 }

-- 


Reply via email to