diff options
| author | Simon Ser <contact@emersion.fr> | 2020-04-02 14:12:26 +0200 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2020-04-08 16:31:21 +0200 |
| commit | 6977f3a843c7a9fc7b7cd4a5d75232c583132cf8 (patch) | |
| tree | c62043c911c01defc6776d4effdaaab3ceeb13e0 /include | |
| parent | e04115898892129977a44e76aa39103a2bdd2144 (diff) | |
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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/backend/drm/drm.h | 2 | ||||
| -rw-r--r-- | include/backend/wayland.h | 1 | ||||
| -rw-r--r-- | include/wlr/interfaces/wlr_output.h | 1 | ||||
| -rw-r--r-- | include/wlr/types/wlr_output.h | 5 |
4 files changed, 4 insertions, 5 deletions
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; diff --git a/include/wlr/interfaces/wlr_output.h b/include/wlr/interfaces/wlr_output.h index c99d0c93..53ff1310 100644 --- a/include/wlr/interfaces/wlr_output.h +++ b/include/wlr/interfaces/wlr_output.h @@ -28,7 +28,6 @@ struct wlr_output_impl { size_t (*get_gamma_size)(struct wlr_output *output); bool (*export_dmabuf)(struct wlr_output *output, struct wlr_dmabuf_attributes *attribs); - bool (*attach_buffer)(struct wlr_output *output, struct wlr_buffer *buffer); }; void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend, diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index 0e2954b9..89ad509c 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -314,8 +314,11 @@ bool wlr_output_attach_render(struct wlr_output *output, int *buffer_age); /** * Attach a buffer to the output. Compositors should call `wlr_output_commit` * to submit the new frame. The output needs to be enabled. + * + * Not all backends support direct scan-out on all buffers. Compositors can + * check whether a buffer is supported by calling `wlr_output_test`. */ -bool wlr_output_attach_buffer(struct wlr_output *output, +void wlr_output_attach_buffer(struct wlr_output *output, struct wlr_buffer *buffer); /** * Get the preferred format for reading pixels. |