From e7c556fcf61eb3121d741cd4da526b2619862678 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 3 Nov 2022 18:30:27 +0100 Subject: [PATCH] backend: drop wlr_backend_get_session() This no longer has purpose. --- backend/backend.c | 9 --------- backend/multi/backend.c | 8 -------- include/backend/multi.h | 2 -- include/wlr/backend.h | 5 ----- include/wlr/backend/interface.h | 1 - 5 files changed, 25 deletions(-) diff --git a/backend/backend.c b/backend/backend.c index 367a5229..2b72d923 100644 --- a/backend/backend.c +++ b/backend/backend.c @@ -66,13 +66,6 @@ void wlr_backend_destroy(struct wlr_backend *backend) { } } -struct wlr_session *wlr_backend_get_session(struct wlr_backend *backend) { - if (backend->impl->get_session) { - return backend->impl->get_session(backend); - } - return NULL; -} - static uint64_t get_current_time_ms(void) { struct timespec ts = {0}; clock_gettime(CLOCK_MONOTONIC, &ts); @@ -388,8 +381,6 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display, #endif success: - struct wlr_multi_backend *multi = wl_container_of(backend, multi, backend); - multi->session = session; if (session_ptr != NULL) { *session_ptr = session; } diff --git a/backend/multi/backend.c b/backend/multi/backend.c index f392db31..49792ff9 100644 --- a/backend/multi/backend.c +++ b/backend/multi/backend.c @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include "backend/backend.h" @@ -63,12 +62,6 @@ static void multi_backend_destroy(struct wlr_backend *wlr_backend) { free(backend); } -static struct wlr_session *multi_backend_get_session( - struct wlr_backend *_backend) { - struct wlr_multi_backend *backend = multi_backend_from_backend(_backend); - return backend->session; -} - static clockid_t multi_backend_get_presentation_clock( struct wlr_backend *backend) { struct wlr_multi_backend *multi = multi_backend_from_backend(backend); @@ -121,7 +114,6 @@ static uint32_t multi_backend_get_buffer_caps(struct wlr_backend *backend) { static const struct wlr_backend_impl backend_impl = { .start = multi_backend_start, .destroy = multi_backend_destroy, - .get_session = multi_backend_get_session, .get_presentation_clock = multi_backend_get_presentation_clock, .get_drm_fd = multi_backend_get_drm_fd, .get_buffer_caps = multi_backend_get_buffer_caps, diff --git a/include/backend/multi.h b/include/backend/multi.h index 2f5f1bd4..20ad9db1 100644 --- a/include/backend/multi.h +++ b/include/backend/multi.h @@ -4,11 +4,9 @@ #include #include #include -#include struct wlr_multi_backend { struct wlr_backend backend; - struct wlr_session *session; struct wl_list backends; diff --git a/include/wlr/backend.h b/include/wlr/backend.h index 5cafad66..9fed75f2 100644 --- a/include/wlr/backend.h +++ b/include/wlr/backend.h @@ -51,11 +51,6 @@ bool wlr_backend_start(struct wlr_backend *backend); * automatically when the struct wl_display is destroyed. */ void wlr_backend_destroy(struct wlr_backend *backend); -/** - * Obtains the struct wlr_session reference from this backend if there is any. - * Might return NULL for backends that don't use a session. - */ -struct wlr_session *wlr_backend_get_session(struct wlr_backend *backend); /** * Returns the clock used by the backend for presentation feedback. */ diff --git a/include/wlr/backend/interface.h b/include/wlr/backend/interface.h index d5bb9bca..8b922f1d 100644 --- a/include/wlr/backend/interface.h +++ b/include/wlr/backend/interface.h @@ -16,7 +16,6 @@ struct wlr_backend_impl { bool (*start)(struct wlr_backend *backend); void (*destroy)(struct wlr_backend *backend); - struct wlr_session *(*get_session)(struct wlr_backend *backend); clockid_t (*get_presentation_clock)(struct wlr_backend *backend); int (*get_drm_fd)(struct wlr_backend *backend); uint32_t (*get_buffer_caps)(struct wlr_backend *backend);