Module: Mesa Branch: main Commit: aa81acf9cb51beb461141be4c88774cf67a0a3bc URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=aa81acf9cb51beb461141be4c88774cf67a0a3bc
Author: Jesse Natalie <[email protected]> Date: Tue Dec 19 11:44:12 2023 -0800 zink: Add ASSERTED to vars that are only used for asserts Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26762> --- src/gallium/drivers/zink/zink_compiler.c | 2 +- src/gallium/drivers/zink/zink_context.c | 4 ++-- src/gallium/drivers/zink/zink_query.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c index 6be551defef..630dbb4b78c 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -3305,7 +3305,7 @@ zink_shader_spirv_compile(struct zink_screen *screen, struct zink_shader *zs, st ret = VKSCR(CreateShaderModule)(screen->dev, &smci, NULL, &obj.mod); else ret = VKSCR(CreateShadersEXT)(screen->dev, 1, &sci, NULL, &obj.obj); - bool success = zink_screen_handle_vkresult(screen, ret); + ASSERTED bool success = zink_screen_handle_vkresult(screen, ret); assert(success); return obj; } diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 7465519b2c4..02f25ebabc5 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -412,7 +412,7 @@ zink_create_sampler_state(struct pipe_context *pctx, const struct pipe_sampler_state *state) { struct zink_screen *screen = zink_screen(pctx->screen); - struct zink_context *zink = zink_context(pctx); + ASSERTED struct zink_context *zink = zink_context(pctx); bool need_custom = false; bool need_clamped_border_color = false; VkSamplerCreateInfo sci = {0}; @@ -5097,7 +5097,7 @@ zink_flush_dgc(struct zink_context *ctx) strides }; VkIndirectCommandsLayoutNV iclayout; - VkResult res = VKSCR(CreateIndirectCommandsLayoutNV)(screen->dev, &lci, NULL, &iclayout); + ASSERTED VkResult res = VKSCR(CreateIndirectCommandsLayoutNV)(screen->dev, &lci, NULL, &iclayout); assert(res == VK_SUCCESS); util_dynarray_append(&bs->dgc.layouts, VkIndirectCommandsLayoutNV, iclayout); diff --git a/src/gallium/drivers/zink/zink_query.c b/src/gallium/drivers/zink/zink_query.c index 4df0de2c0c5..c10fb4fd8f4 100644 --- a/src/gallium/drivers/zink/zink_query.c +++ b/src/gallium/drivers/zink/zink_query.c @@ -403,7 +403,7 @@ unref_vk_query(struct zink_context *ctx, struct zink_vk_query *vkq) static void destroy_query(struct zink_context *ctx, struct zink_query *query) { - struct zink_screen *screen = zink_screen(ctx->base.screen); + ASSERTED struct zink_screen *screen = zink_screen(ctx->base.screen); assert(zink_screen_usage_check_completion(screen, query->batch_uses)); struct zink_query_buffer *qbo, *next;
