mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

backend-wayland: multi-backend support 

Insert the backend into the weston_compositor::backend_list instead
of setting weston_compositor::backend. The compositor uses this to
determine whether the backend is capable of being loaded simultaneously
with other backends.

The Wayland backend can only be loaded as primary backend.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
This commit is contained in:
Philipp Zabel 2021-03-11 16:10:28 +01:00 committed by Derek Foreman
parent c857042b45
commit bb3b9374aa
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libweston/backend-wayland/wayland.c
View File

@ -2775,6 +2775,8 @@ wayland_destroy(struct weston_backend *backend)
struct wayland_parent_output *output, *next_output;
struct wayland_input *input, *next_input;
wl_list_remove(&b->base.link);
wl_list_for_each_safe(base, next, &ec->head_list, compositor_link) {
if (to_wayland_head(base))
wayland_head_destroy(base);
@ -2887,7 +2889,7 @@ wayland_backend_create(struct weston_compositor *compositor,
return NULL;
b->compositor = compositor;
compositor->backend = &b->base;
wl_list_insert(&compositor->backend_list, &b->base.link);
b->base.supported_presentation_clocks =
WESTON_PRESENTATION_CLOCKS_SOFTWARE;
@ -2987,6 +2989,7 @@ err_renderer:
err_display:
wl_display_disconnect(b->parent.wl_display);
err_compositor:
wl_list_remove(&b->base.link);
free(b->formats);
free(b);
return NULL;
@ -3003,6 +3006,7 @@ wayland_backend_destroy(struct wayland_backend *b)
cairo_device_destroy(b->frame_device);
wl_cursor_theme_destroy(b->cursor_theme);
wl_list_remove(&b->base.link);
cleanup_after_cairo();
free(b->formats);
free(b);
@ -3034,6 +3038,11 @@ weston_backend_init(struct weston_compositor *compositor,
return -1;
}
if (compositor->renderer) {
weston_log("wayland backend must be the primary backend\n");
return -1;
}
config_init_to_defaults(&new_config);
memcpy(&new_config, config_base, config_base->struct_size);