From b86a0c8d8fa01998b8f9b28b70c18de338cb9236 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 18 Dec 2020 18:32:08 +0100 Subject: backend/drm: move cursor fields to wlr_drm_connector Doesn't make a lot of sense to split the cursor fields between wlr_drm_plane and wlr_drm_connector. Let's just move everything to wlr_drm_connector. --- include/backend/drm/drm.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index d742fdd1..378e9d20 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -34,11 +34,6 @@ struct wlr_drm_plane { struct wlr_drm_format_set formats; - // Only used by cursor plane - bool cursor_enabled; - int cursor_width, cursor_height; - int cursor_hotspot_x, cursor_hotspot_y; - union wlr_drm_plane_props props; }; @@ -123,7 +118,10 @@ struct wlr_drm_connector { union wlr_drm_connector_props props; - int32_t cursor_x, cursor_y; + bool cursor_enabled; + int cursor_x, cursor_y; + int cursor_width, cursor_height; + int cursor_hotspot_x, cursor_hotspot_y; drmModeCrtc *old_crtc; -- cgit v1.2.3