From f935ff0ef6e9ed95eb33fdc5dfec39d53a6d7134 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 23 Nov 2023 16:05:37 +0100 Subject: backend/drm: move drm_plane_finish_surface() to drm.c This function touches queued_fb/current_fb, which the renderer has nothing to do with. --- backend/drm/drm.c | 11 +++++++++++ backend/drm/renderer.c | 14 +------------- include/backend/drm/renderer.h | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 41b4ea96..b630c9dd 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -305,6 +305,17 @@ error_res: return false; } +static void drm_plane_finish_surface(struct wlr_drm_plane *plane) { + if (!plane) { + return; + } + + drm_fb_clear(&plane->queued_fb); + drm_fb_clear(&plane->current_fb); + + finish_drm_surface(&plane->mgpu_surf); +} + void finish_drm_resources(struct wlr_drm_backend *drm) { if (!drm) { return; diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c index 6619d6e9..374f071f 100644 --- a/backend/drm/renderer.c +++ b/backend/drm/renderer.c @@ -41,7 +41,7 @@ void finish_drm_renderer(struct wlr_drm_renderer *renderer) { wlr_renderer_destroy(renderer->wlr_rend); } -static void finish_drm_surface(struct wlr_drm_surface *surf) { +void finish_drm_surface(struct wlr_drm_surface *surf) { if (!surf || !surf->renderer) { return; } @@ -121,18 +121,6 @@ error_tex: return NULL; } - -void drm_plane_finish_surface(struct wlr_drm_plane *plane) { - if (!plane) { - return; - } - - drm_fb_clear(&plane->queued_fb); - drm_fb_clear(&plane->current_fb); - - finish_drm_surface(&plane->mgpu_surf); -} - bool drm_plane_pick_render_format(struct wlr_drm_plane *plane, struct wlr_drm_format *fmt, struct wlr_drm_renderer *renderer) { const struct wlr_drm_format_set *render_formats = diff --git a/include/backend/drm/renderer.h b/include/backend/drm/renderer.h index c39d4c15..0bd26572 100644 --- a/include/backend/drm/renderer.h +++ b/include/backend/drm/renderer.h @@ -31,12 +31,12 @@ void finish_drm_renderer(struct wlr_drm_renderer *renderer); bool init_drm_surface(struct wlr_drm_surface *surf, struct wlr_drm_renderer *renderer, int width, int height, const struct wlr_drm_format *drm_format); +void finish_drm_surface(struct wlr_drm_surface *surf); struct wlr_buffer *drm_surface_blit(struct wlr_drm_surface *surf, struct wlr_buffer *buffer); bool drm_plane_pick_render_format(struct wlr_drm_plane *plane, struct wlr_drm_format *fmt, struct wlr_drm_renderer *renderer); -void drm_plane_finish_surface(struct wlr_drm_plane *plane); #endif -- cgit v1.2.3