mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-14 06:59:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

output: check buffer in wlr_output_test

Browse source 
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.
This commit is contained in:
Simon Ser 2020-04-02 14:12:26 +02:00 • committed by Drew DeVault
parent e041158988
commit 6977f3a843
7 changed files with 122 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/backend/drm/drm.h
View file

@ -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;

1
include/backend/wayland.h
View file

@ -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;

1
include/wlr/interfaces/wlr_output.h
View file

@ -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,

5
include/wlr/types/wlr_output.h
View file

@ -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.