move E_Comp->root window setting into e_comp_wl_init() for wl compositors

This commit is contained in:
Mike Blumenkrantz 2015-03-20 15:08:28 -04:00
parent 85376125e0
commit 9986311035
4 changed files with 2 additions and 3 deletions

View File

@ -2541,6 +2541,8 @@ disp_err:
EAPI Eina_Bool
e_comp_wl_init(void)
{
if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
e_comp->root = ecore_evas_window_get(e_comp->ee);
/* set gl available if we have ecore_evas support */
if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_WAYLAND_EGL) ||
ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_DRM))

View File

@ -133,7 +133,6 @@ e_modapi_init(E_Module *m)
e_xinerama_screens_set(eina_list_append(NULL, screen));
}
comp->root = ecore_evas_window_get(comp->ee);
if (!e_comp_canvas_init(w, h)) return NULL;
e_comp_canvas_fake_layers_init();

View File

@ -42,7 +42,6 @@ e_modapi_init(E_Module *m)
screen->h = h;
e_xinerama_screens_set(eina_list_append(NULL, screen));
}
comp->root = ecore_evas_window_get(comp->ee);
e_comp_canvas_init(w, h);
e_comp_wl_init();
e_comp_canvas_fake_layers_init();

View File

@ -101,7 +101,6 @@ e_modapi_init(E_Module *m)
e_xinerama_screens_set(eina_list_append(NULL, screen));
}
comp->root = ecore_evas_window_get(comp->ee);
if (!e_comp_canvas_init(w, h)) return NULL;
e_comp_canvas_fake_layers_init();