discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=85d7c121bd281f5b0e24006bd717444ea58a4d15
commit 85d7c121bd281f5b0e24006bd717444ea58a4d15
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Fri Jan 22 17:06:42 2016 -0500
do not attempt to create x11 canvas during xwayland init
this kills the gl_drm engine
---
src/bin/e_comp_x.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 5a06042..015f740 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -5237,8 +5237,11 @@ _e_comp_x_setup(Ecore_X_Window root, int w, int h)
e_alert_composite_win(root, e_comp->win);
- if (!e_comp_x_randr_canvas_new(e_comp->win, w, h))
- ecore_job_add(_e_comp_x_add_fail_job, NULL);
+ if (!e_comp->ee)
+ {
+ if (!e_comp_x_randr_canvas_new(e_comp->win, w, h))
+ ecore_job_add(_e_comp_x_add_fail_job, NULL);
+ }
ecore_x_composite_redirect_subwindows(root,
ECORE_X_COMPOSITE_UPDATE_MANUAL);
--
