forked from enlightenment/enlightenment
move E_Comp->root window setting into e_comp_wl_init() for wl compositors
This commit is contained in:
parent
85376125e0
commit
9986311035
|
@ -2541,6 +2541,8 @@ disp_err:
|
||||||
EAPI Eina_Bool
|
EAPI Eina_Bool
|
||||||
e_comp_wl_init(void)
|
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 */
|
/* set gl available if we have ecore_evas support */
|
||||||
if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_WAYLAND_EGL) ||
|
if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_WAYLAND_EGL) ||
|
||||||
ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_DRM))
|
ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_DRM))
|
||||||
|
|
|
@ -133,7 +133,6 @@ e_modapi_init(E_Module *m)
|
||||||
e_xinerama_screens_set(eina_list_append(NULL, screen));
|
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;
|
if (!e_comp_canvas_init(w, h)) return NULL;
|
||||||
e_comp_canvas_fake_layers_init();
|
e_comp_canvas_fake_layers_init();
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,6 @@ e_modapi_init(E_Module *m)
|
||||||
screen->h = h;
|
screen->h = h;
|
||||||
e_xinerama_screens_set(eina_list_append(NULL, screen));
|
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_canvas_init(w, h);
|
||||||
e_comp_wl_init();
|
e_comp_wl_init();
|
||||||
e_comp_canvas_fake_layers_init();
|
e_comp_canvas_fake_layers_init();
|
||||||
|
|
|
@ -101,7 +101,6 @@ e_modapi_init(E_Module *m)
|
||||||
e_xinerama_screens_set(eina_list_append(NULL, screen));
|
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;
|
if (!e_comp_canvas_init(w, h)) return NULL;
|
||||||
e_comp_canvas_fake_layers_init();
|
e_comp_canvas_fake_layers_init();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue