mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

output: Drop wlr_output_attach_render

Browse source
This commit is contained in:
Alexander Orzechowski 2023-11-29 16:00:23 -05:00
parent 3faf9883dc
commit fc6000251c
3 changed files with 17 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -120,9 +120,8 @@ struct wlr_render_pass;
* The `frame` event will be emitted when it is a good time for the compositor * The `frame` event will be emitted when it is a good time for the compositor
* to submit a new frame. * to submit a new frame.
* *
* To render a new frame, compositors should call wlr_output_attach_render(), * To render a new frame, compositors should call wlr_output_begin_render_pass(),
* render and call wlr_output_commit(). No rendering should happen outside a * perform rendering on that render pass and finally call wlr_output_commit().
* `frame` event handler or before wlr_output_attach_render().
*/ */
struct wlr_output { struct wlr_output {
const struct wlr_output_impl *impl; const struct wlr_output_impl *impl;

4
include/wlr/types/wlr_output_layer.h
View file

@ -18,8 +18,8 @@
* An output layer. * An output layer.
* *
* Output layers are displayed between the output primary buffer (see * Output layers are displayed between the output primary buffer (see
* wlr_output_attach_buffer() and wlr_output_attach_render()) and the cursor * wlr_output_attach_buffer()) and the cursor buffer. They can offload some
* buffer. They can offload some rendering work to the backend. * rendering work to the backend.
* *
* To configure output layers, callers should call wlr_output_layer_create() to * To configure output layers, callers should call wlr_output_layer_create() to
* create layers, attach struct wlr_output_layer_state onto * create layers, attach struct wlr_output_layer_state onto

41
types/output/render.c
View file

@ -57,32 +57,6 @@ void output_clear_back_buffer(struct wlr_output *output) {
output->back_buffer = NULL; output->back_buffer = NULL;
} }
bool wlr_output_attach_render(struct wlr_output *output, int *buffer_age) {
assert(output->back_buffer == NULL);
if (!wlr_output_configure_primary_swapchain(output, &output->pending,
&output->swapchain)) {
return false;
}
struct wlr_renderer *renderer = output->renderer;
assert(renderer != NULL);
struct wlr_buffer *buffer =
wlr_swapchain_acquire(output->swapchain, buffer_age);
if (buffer == NULL) {
return false;
}
if (!renderer_bind_buffer(renderer, buffer)) {
wlr_buffer_unlock(buffer);
return false;
}
output->back_buffer = buffer;
return true;
}
static struct wlr_buffer *output_acquire_empty_buffer(struct wlr_output *output, static struct wlr_buffer *output_acquire_empty_buffer(struct wlr_output *output,
const struct wlr_output_state *state) { const struct wlr_output_state *state) {
assert(!(state->committed & WLR_OUTPUT_STATE_BUFFER)); assert(!(state->committed & WLR_OUTPUT_STATE_BUFFER));
@ -247,13 +221,24 @@ uint32_t wlr_output_preferred_read_format(struct wlr_output *output) {
return DRM_FORMAT_INVALID; return DRM_FORMAT_INVALID;
} }
if (!wlr_output_attach_render(output, NULL)) { if (!wlr_output_configure_primary_swapchain(output, &output->pending, &output->swapchain)) {
return false;
}
struct wlr_buffer *buffer = wlr_swapchain_acquire(output->swapchain, NULL);
if (buffer == NULL) {
return false;
}
if (!wlr_renderer_begin_with_buffer(renderer, buffer)) {
wlr_buffer_unlock(buffer);
return false; return false;
} }
uint32_t fmt = renderer->impl->preferred_read_format(renderer); uint32_t fmt = renderer->impl->preferred_read_format(renderer);
output_clear_back_buffer(output); wlr_renderer_end(renderer);
wlr_buffer_unlock(buffer);
return fmt; return fmt;
} }