aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2021-07-12 17:22:22 +0200
committerSimon Ser <contact@emersion.fr>2021-07-28 22:52:35 +0200
commit9b99570869e41158b2cd5681b6403a74312fcc69 (patch)
tree039ca6ffe61c8e68368c83c073884026ab65f76f
parentebb661532c57bf5c44301b03602abd2cd30f794f (diff)
backend/drm: drop drm_surface_{make,unset}_current
-rw-r--r--backend/drm/renderer.c29
-rw-r--r--include/backend/drm/renderer.h3
2 files changed, 0 insertions, 32 deletions
diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c
index 2d3adfd4..78a1d11f 100644
--- a/backend/drm/renderer.c
+++ b/backend/drm/renderer.c
@@ -72,8 +72,6 @@ bool init_drm_surface(struct wlr_drm_surface *surf,
surf->width = width;
surf->height = height;
- wlr_buffer_unlock(surf->back_buffer);
- surf->back_buffer = NULL;
wlr_swapchain_destroy(surf->swapchain);
surf->swapchain = NULL;
@@ -93,38 +91,11 @@ static void finish_drm_surface(struct wlr_drm_surface *surf) {
return;
}
- wlr_buffer_unlock(surf->back_buffer);
wlr_swapchain_destroy(surf->swapchain);
memset(surf, 0, sizeof(*surf));
}
-bool drm_surface_make_current(struct wlr_drm_surface *surf,
- int *buffer_age) {
- wlr_buffer_unlock(surf->back_buffer);
- surf->back_buffer = wlr_swapchain_acquire(surf->swapchain, buffer_age);
- if (surf->back_buffer == NULL) {
- wlr_log(WLR_ERROR, "Failed to acquire swapchain buffer");
- return false;
- }
-
- if (!renderer_bind_buffer(surf->renderer->wlr_rend, surf->back_buffer)) {
- wlr_log(WLR_ERROR, "Failed to bind buffer to renderer");
- return false;
- }
-
- return true;
-}
-
-void drm_surface_unset_current(struct wlr_drm_surface *surf) {
- assert(surf->back_buffer != NULL);
-
- renderer_bind_buffer(surf->renderer->wlr_rend, NULL);
-
- wlr_buffer_unlock(surf->back_buffer);
- surf->back_buffer = NULL;
-}
-
struct wlr_buffer *drm_surface_blit(struct wlr_drm_surface *surf,
struct wlr_buffer *buffer) {
struct wlr_renderer *renderer = surf->renderer->wlr_rend;
diff --git a/include/backend/drm/renderer.h b/include/backend/drm/renderer.h
index 17025dfc..528f2189 100644
--- a/include/backend/drm/renderer.h
+++ b/include/backend/drm/renderer.h
@@ -26,7 +26,6 @@ struct wlr_drm_surface {
uint32_t height;
struct wlr_swapchain *swapchain;
- struct wlr_buffer *back_buffer;
};
struct wlr_drm_fb {
@@ -46,8 +45,6 @@ void finish_drm_renderer(struct wlr_drm_renderer *renderer);
bool init_drm_surface(struct wlr_drm_surface *surf,
struct wlr_drm_renderer *renderer, uint32_t width, uint32_t height,
const struct wlr_drm_format *drm_format);
-bool drm_surface_make_current(struct wlr_drm_surface *surf, int *buffer_age);
-void drm_surface_unset_current(struct wlr_drm_surface *surf);
bool drm_fb_import(struct wlr_drm_fb **fb, struct wlr_drm_backend *drm,
struct wlr_buffer *buf, const struct wlr_drm_format_set *formats);