summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-08-11 18:48:53 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-08-11 18:48:49 -0400
commit2047ca3bfe3565bdd6d8282279bcadb32f8d4ccd (patch)
treedb9d07250ecc46e0845755479e1ec54a608b77e0
parent65fe42fdef635d95135e85ecf6cb20048844e726 (diff)
downloadenlightenment-2047ca3bfe3565bdd6d8282279bcadb32f8d4ccd.tar.gz
handle case where eglBindWaylandDisplay fails during wl init
-rw-r--r--src/bin/e_comp_wl.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 09462e4205..4f359b76d8 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();
}