From b7dca21c2b8ac707e8d3e2abe68f787d524a202d Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 10 Jul 2023 11:31:01 +0200 Subject: [PATCH] render: constify struct wlr_buffer_pass_options Let's not allow renderer implementations to mutate the passed in options. --- include/wlr/render/interface.h | 2 +- include/wlr/render/wlr_renderer.h | 2 +- render/gles2/renderer.c | 2 +- render/pixman/renderer.c | 2 +- render/vulkan/renderer.c | 2 +- render/wlr_renderer.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h index c352efe1..bdb5bbb8 100644 --- a/include/wlr/render/interface.h +++ b/include/wlr/render/interface.h @@ -49,7 +49,7 @@ struct wlr_renderer_impl { struct wlr_texture *(*texture_from_buffer)(struct wlr_renderer *renderer, struct wlr_buffer *buffer); struct wlr_render_pass *(*begin_buffer_pass)(struct wlr_renderer *renderer, - struct wlr_buffer *buffer, struct wlr_buffer_pass_options *options); + struct wlr_buffer *buffer, const struct wlr_buffer_pass_options *options); struct wlr_render_timer *(*render_timer_create)(struct wlr_renderer *renderer); }; diff --git a/include/wlr/render/wlr_renderer.h b/include/wlr/render/wlr_renderer.h index f6e63223..61e31561 100644 --- a/include/wlr/render/wlr_renderer.h +++ b/include/wlr/render/wlr_renderer.h @@ -177,7 +177,7 @@ struct wlr_buffer_pass_options { * render pass. */ struct wlr_render_pass *wlr_renderer_begin_buffer_pass(struct wlr_renderer *renderer, - struct wlr_buffer *buffer, struct wlr_buffer_pass_options *options); + struct wlr_buffer *buffer, const struct wlr_buffer_pass_options *options); /** * Submit the render pass. diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index 2b6c04b9..9fe934f7 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -552,7 +552,7 @@ static void gles2_destroy(struct wlr_renderer *wlr_renderer) { } static struct wlr_render_pass *gles2_begin_buffer_pass(struct wlr_renderer *wlr_renderer, - struct wlr_buffer *wlr_buffer, struct wlr_buffer_pass_options *options) { + struct wlr_buffer *wlr_buffer, const struct wlr_buffer_pass_options *options) { struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer); if (!wlr_egl_make_current(renderer->egl)) { return NULL; diff --git a/render/pixman/renderer.c b/render/pixman/renderer.c index 770f47ca..1d093024 100644 --- a/render/pixman/renderer.c +++ b/render/pixman/renderer.c @@ -493,7 +493,7 @@ static uint32_t pixman_get_render_buffer_caps(struct wlr_renderer *renderer) { } static struct wlr_render_pass *pixman_begin_buffer_pass(struct wlr_renderer *wlr_renderer, - struct wlr_buffer *wlr_buffer, struct wlr_buffer_pass_options *options) { + struct wlr_buffer *wlr_buffer, const struct wlr_buffer_pass_options *options) { struct wlr_pixman_renderer *renderer = get_renderer(wlr_renderer); struct wlr_pixman_buffer *buffer = get_buffer(renderer, wlr_buffer); diff --git a/render/vulkan/renderer.c b/render/vulkan/renderer.c index 4419cf2c..736c9e96 100644 --- a/render/vulkan/renderer.c +++ b/render/vulkan/renderer.c @@ -1922,7 +1922,7 @@ static uint32_t vulkan_get_render_buffer_caps(struct wlr_renderer *wlr_renderer) } static struct wlr_render_pass *vulkan_begin_buffer_pass(struct wlr_renderer *wlr_renderer, - struct wlr_buffer *buffer, struct wlr_buffer_pass_options *options) { + struct wlr_buffer *buffer, const struct wlr_buffer_pass_options *options) { struct wlr_vk_renderer *renderer = vulkan_get_renderer(wlr_renderer); struct wlr_vk_render_buffer *render_buffer = get_render_buffer(renderer, buffer); diff --git a/render/wlr_renderer.c b/render/wlr_renderer.c index d92d1bef..cda03435 100644 --- a/render/wlr_renderer.c +++ b/render/wlr_renderer.c @@ -415,7 +415,7 @@ int wlr_renderer_get_drm_fd(struct wlr_renderer *r) { } struct wlr_render_pass *wlr_renderer_begin_buffer_pass(struct wlr_renderer *renderer, - struct wlr_buffer *buffer, struct wlr_buffer_pass_options *options) { + struct wlr_buffer *buffer, const struct wlr_buffer_pass_options *options) { if (!renderer->impl->begin_buffer_pass) { return begin_legacy_buffer_render_pass(renderer, buffer); }