From f5900c1f00f86078f576f5367f6cd707fdeec8c3 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Tue, 8 Jun 2021 11:05:50 +0200 Subject: backend/drm: remove primary swapchain We can't nuke it completely, we still need it for multi-GPU. --- include/backend/drm/drm.h | 4 +--- include/backend/drm/renderer.h | 6 ------ 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'include') diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 8c0b0777..881d4718 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -20,9 +20,7 @@ struct wlr_drm_plane { uint32_t type; uint32_t id; - /* Local if this isn't a multi-GPU setup, on the parent otherwise. */ - struct wlr_drm_surface surf; - /* Local, only initialized on multi-GPU setups. */ + /* Only initialized on multi-GPU setups */ struct wlr_drm_surface mgpu_surf; /* Buffer to be submitted to the kernel on the next page-flip */ diff --git a/include/backend/drm/renderer.h b/include/backend/drm/renderer.h index 468dd41e..17025dfc 100644 --- a/include/backend/drm/renderer.h +++ b/include/backend/drm/renderer.h @@ -58,15 +58,9 @@ void drm_fb_move(struct wlr_drm_fb **new, struct wlr_drm_fb **old); struct wlr_buffer *drm_surface_blit(struct wlr_drm_surface *surf, struct wlr_buffer *buffer); -bool drm_surface_render_black_frame(struct wlr_drm_surface *surf); struct wlr_drm_format *drm_plane_pick_render_format( struct wlr_drm_plane *plane, struct wlr_drm_renderer *renderer); -bool drm_plane_init_surface(struct wlr_drm_plane *plane, - struct wlr_drm_backend *drm, int32_t width, uint32_t height, - bool with_modifiers); void drm_plane_finish_surface(struct wlr_drm_plane *plane); -bool drm_plane_lock_surface(struct wlr_drm_plane *plane, - struct wlr_drm_backend *drm); #endif -- cgit v1.2.3