From bf93d2e67c51e7f3f88620999f0225a34c039047 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 19 Jun 2020 15:49:55 +0200 Subject: output: rename impl->rollback to rollback_render The output backend API is now mostly state-less thanks to the atomic hooks (commit and test). There is one exception though: attach_render. This function makes the rendering context current. However sometimes the compositor might decide not to render after attach_render (e.g. when there's nothing new to render to the back buffer). Thus wlr_output_rollback has been introduced to revert the pending state. Because the output backend API is mostly state-less, the only thing wlr_output_impl.rollback needs to do is revert the current rendering context. Rename the function to rollback_render to make this clear. Add a check in the common wlr_output code to only call rollback_render when attach_buffer has been previously called. On the long term, we'll be able to remove attach_render and rollback_render together. --- include/wlr/interfaces/wlr_output.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/wlr') diff --git a/include/wlr/interfaces/wlr_output.h b/include/wlr/interfaces/wlr_output.h index 8913cf41..13c9e6dc 100644 --- a/include/wlr/interfaces/wlr_output.h +++ b/include/wlr/interfaces/wlr_output.h @@ -23,7 +23,7 @@ struct wlr_output_impl { bool (*attach_render)(struct wlr_output *output, int *buffer_age); bool (*test)(struct wlr_output *output); bool (*commit)(struct wlr_output *output); - void (*rollback)(struct wlr_output *output); + void (*rollback_render)(struct wlr_output *output); size_t (*get_gamma_size)(struct wlr_output *output); bool (*export_dmabuf)(struct wlr_output *output, struct wlr_dmabuf_attributes *attribs); -- cgit v1.2.3