From a165261f7f099475547b54bafd78a4465728a5cd Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 30 Nov 2023 19:48:01 +0100 Subject: [PATCH] output: replace wlr_render_timer arg with wlr_buffer_pass_options This scales better when more render pass options are added. --- include/wlr/types/wlr_output.h | 3 ++- types/output/render.c | 8 +++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index 2740abda..b0905eec 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -722,6 +722,7 @@ bool wlr_output_configure_primary_swapchain(struct wlr_output *output, * frames or -1 if unknown. This is useful for damage tracking. */ struct wlr_render_pass *wlr_output_begin_render_pass(struct wlr_output *output, - struct wlr_output_state *state, int *buffer_age, struct wlr_render_timer *timer); + struct wlr_output_state *state, int *buffer_age, + struct wlr_buffer_pass_options *render_options); #endif diff --git a/types/output/render.c b/types/output/render.c index 13d57dc5..5733e968 100644 --- a/types/output/render.c +++ b/types/output/render.c @@ -229,7 +229,8 @@ uint32_t wlr_output_preferred_read_format(struct wlr_output *output) { } struct wlr_render_pass *wlr_output_begin_render_pass(struct wlr_output *output, - struct wlr_output_state *state, int *buffer_age, struct wlr_render_timer *timer) { + struct wlr_output_state *state, int *buffer_age, + struct wlr_buffer_pass_options *render_options) { if (!wlr_output_configure_primary_swapchain(output, state, &output->swapchain)) { return NULL; } @@ -241,10 +242,7 @@ struct wlr_render_pass *wlr_output_begin_render_pass(struct wlr_output *output, struct wlr_renderer *renderer = output->renderer; assert(renderer != NULL); - struct wlr_render_pass *pass = wlr_renderer_begin_buffer_pass(renderer, buffer, - &(struct wlr_buffer_pass_options){ - .timer = timer, - }); + struct wlr_render_pass *pass = wlr_renderer_begin_buffer_pass(renderer, buffer, render_options); if (pass == NULL) { return NULL; }