From 54f9944b4885e4a08c0f004136ef06f732b8308f Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 23 Nov 2023 14:08:46 +0100 Subject: backend/drm: drop wl_display argument We can grab the event loop from the wlr_session instead. --- include/backend/drm/drm.h | 2 -- include/backend/drm/monitor.h | 3 +-- include/wlr/backend/drm.h | 5 ++--- 3 files changed, 3 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 39a247b1..4b75b8a4 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -91,10 +91,8 @@ struct wlr_drm_backend { size_t num_planes; struct wlr_drm_plane *planes; - struct wl_display *display; struct wl_event_source *drm_event; - struct wl_listener display_destroy; struct wl_listener session_destroy; struct wl_listener session_active; struct wl_listener parent_destroy; diff --git a/include/backend/drm/monitor.h b/include/backend/drm/monitor.h index bf5bda2d..51817193 100644 --- a/include/backend/drm/monitor.h +++ b/include/backend/drm/monitor.h @@ -10,7 +10,6 @@ struct wlr_drm_backend_monitor { struct wlr_backend *multi; struct wlr_backend *primary_drm; struct wlr_session *session; - struct wl_display *display; struct wl_listener multi_destroy; struct wl_listener primary_drm_destroy; @@ -20,6 +19,6 @@ struct wlr_drm_backend_monitor { struct wlr_drm_backend_monitor *drm_backend_monitor_create( struct wlr_backend *multi, struct wlr_backend *primary_drm, - struct wlr_session *session, struct wl_display *display); + struct wlr_session *session); #endif diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h index e8f9f6a3..3ca6390a 100644 --- a/include/wlr/backend/drm.h +++ b/include/wlr/backend/drm.h @@ -36,9 +36,8 @@ struct wlr_drm_lease { * To slave this to another DRM backend, pass it as the parent (which _must_ be * a DRM backend, other kinds of backends raise SIGABRT). */ -struct wlr_backend *wlr_drm_backend_create(struct wl_display *display, - struct wlr_session *session, struct wlr_device *dev, - struct wlr_backend *parent); +struct wlr_backend *wlr_drm_backend_create(struct wlr_session *session, + struct wlr_device *dev, struct wlr_backend *parent); bool wlr_backend_is_drm(struct wlr_backend *backend); bool wlr_output_is_drm(struct wlr_output *output); -- cgit v1.2.3