From d525ba85895aa7883bd60d8c7138a23f74124590 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <zmike@osg.samsung.com>
Date: Thu, 28 Apr 2016 17:57:34 -0400
Subject: [PATCH] directly load extra wl modules during compositor init

speed++++++++
---
 src/bin/e_comp_wl.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 0bedc3da4..e81bb9f4e 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -74,8 +74,8 @@ _e_comp_wl_focus_check(void)
 /*    EINA_LOG_DOM_INFO(e_log_dom, format, args); */
 /* } */
 
-static Eina_Bool
-_e_comp_wl_cb_module_idle(void *data EINA_UNUSED)
+static void
+_e_comp_wl_modules_load(void)
 {
    const char **m, *mods[] =
    {
@@ -84,9 +84,6 @@ _e_comp_wl_cb_module_idle(void *data EINA_UNUSED)
       NULL
    };
 
-   /* check if we are still loading modules */
-   if (e_module_loading_get()) return ECORE_CALLBACK_RENEW;
-
    for (m = mods; *m; m++)
      {
         E_Module *mod = e_module_find(*m);
@@ -97,11 +94,6 @@ _e_comp_wl_cb_module_idle(void *data EINA_UNUSED)
         if (mod)
           e_module_enable(mod);
      }
-
-   /* FIXME: NB:
-    * Do we need to dispatch pending wl events here ?? */
-
-   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -2555,8 +2547,7 @@ _e_comp_wl_compositor_create(void)
 #endif
    e_comp_wl->wl.client_disp = ecore_wl2_display_connect(NULL);
 
-   /* setup module idler to load shell mmodule */
-   ecore_idler_add(_e_comp_wl_cb_module_idle, cdata);
+   _e_comp_wl_modules_load();
 
    if (e_comp->comp_type == E_PIXMAP_TYPE_X)
      {