directly load extra wl modules during compositor init

speed++++++++
This commit is contained in:
Mike Blumenkrantz 2016-04-28 17:57:34 -04:00
parent a0d5d4b839
commit d525ba8589
1 changed files with 3 additions and 12 deletions

View File

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