discomfitor pushed a commit to branch enlightenment-0.21.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=4034bd97bed18b81bb0f27e05c7d7af2313277be

commit 4034bd97bed18b81bb0f27e05c7d7af2313277be
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Mon Aug 7 10:29:00 2017 -0400

    do not defer wl gl init
---
 src/bin/e_comp_wl.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index cb5046d58..cd8edfd10 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2792,9 +2792,9 @@ _e_comp_wl_gl_shutdown(void)
 }
 
 static void
-_e_comp_wl_gl_init(void *d EINA_UNUSED)
+_e_comp_wl_gl_init(void)
 {
-   e_comp_wl->wl.gl = evas_gl_new(e_comp->evas);
+   e_comp_wl->wl.gl = evas_gl_new(ecore_evas_get(e_comp->ee));
    if (!e_comp_wl->wl.gl) return;
    e_comp_wl->wl.glctx = evas_gl_context_create(e_comp_wl->wl.gl, NULL);
    e_comp_wl->wl.glcfg = evas_gl_config_new();
@@ -2863,7 +2863,7 @@ e_comp_wl_init(void)
    e_util_env_set("WAYLAND_DEBUG", "0");
    e_util_env_set("ELM_DISPLAY", "wl");
    if (e_comp_gl_get())
-     ecore_job_add(_e_comp_wl_gl_init, NULL);
+     _e_comp_wl_gl_init();
 
    E_LIST_HANDLER_APPEND(handlers, E_EVENT_RANDR_CHANGE,
                                 _e_comp_wl_cb_randr_change, NULL);

-- 


Reply via email to