From a937016e38efe3d7ad71540755833242059e6902 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Tue, 19 Dec 2017 18:25:46 -0500 Subject: remove session from multibackend --- backend/multi/backend.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'backend/multi') diff --git a/backend/multi/backend.c b/backend/multi/backend.c index 3815a0bc..df7c8c6d 100644 --- a/backend/multi/backend.c +++ b/backend/multi/backend.c @@ -5,6 +5,7 @@ #include #include #include "backend/multi.h" +#include "backend/drm/drm.h" struct subbackend_state { struct wlr_backend *backend; @@ -57,14 +58,7 @@ struct wlr_backend_impl backend_impl = { .get_egl = multi_backend_get_egl, }; -static void handle_display_destroy(struct wl_listener *listener, void *data) { - struct wlr_multi_backend *backend = - wl_container_of(listener, backend, display_destroy); - multi_backend_destroy(&backend->backend); -} - -struct wlr_backend *wlr_multi_backend_create(struct wl_display *display, - struct wlr_session *session) { +struct wlr_backend *wlr_multi_backend_create(struct wl_display *display) { struct wlr_multi_backend *backend = calloc(1, sizeof(struct wlr_multi_backend)); if (!backend) { @@ -72,13 +66,9 @@ struct wlr_backend *wlr_multi_backend_create(struct wl_display *display, return NULL; } - backend->session = session; wl_list_init(&backend->backends); wlr_backend_init(&backend->backend, &backend_impl); - session->display_destroy.notify = handle_display_destroy; - wl_display_add_destroy_listener(display, &session->display_destroy); - return &backend->backend; } @@ -140,5 +130,11 @@ struct wlr_session *wlr_multi_get_session(struct wlr_backend *_backend) { assert(wlr_backend_is_multi(_backend)); struct wlr_multi_backend *backend = (struct wlr_multi_backend *)_backend; - return backend->session; + struct subbackend_state *sub; + wl_list_for_each(sub, &backend->backends, link) { + if (wlr_backend_is_drm(sub->backend)) { + return wlr_drm_backend_get_session(sub->backend); + } + } + return NULL; } -- cgit v1.2.3