From 6977f3a843c7a9fc7b7cd4a5d75232c583132cf8 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 2 Apr 2020 14:12:26 +0200 Subject: output: check buffer in wlr_output_test Check that buffer can be scanned out in wlr_output_test instead of wlr_output_attach_buffer. This allows the backend to have access to the whole pending state when performing the check. This brings the wlr_output API more in line with the KMS API. This removes the need for wlr_output_attach_buffer to return a value, and for wlr_output_impl.attach_buffer. --- include/backend/drm/drm.h | 2 -- include/backend/wayland.h | 1 - 2 files changed, 3 deletions(-) (limited to 'include/backend') diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 5de4a7d1..ffd3138f 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -128,8 +128,6 @@ struct wlr_drm_connector { struct wl_event_source *retry_pageflip; struct wl_list link; - // DMA-BUF to be displayed on next commit - struct wlr_dmabuf_attributes pending_dmabuf; // Buffer submitted to the kernel but not yet displayed struct wlr_buffer *pending_buffer; struct gbm_bo *pending_bo; diff --git a/include/backend/wayland.h b/include/backend/wayland.h index 4e666c3a..9a8a404b 100644 --- a/include/backend/wayland.h +++ b/include/backend/wayland.h @@ -72,7 +72,6 @@ struct wlr_wl_output { struct zxdg_toplevel_decoration_v1 *zxdg_toplevel_decoration_v1; struct wl_egl_window *egl_window; EGLSurface egl_surface; - struct wlr_wl_buffer *pending_buffer; struct wl_list presentation_feedbacks; uint32_t enter_serial; -- cgit v1.2.3