From b6f0826ce59331b887beae3d91328495d55cf60d Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 3 Sep 2025 15:55:50 -0400 Subject: [PATCH] zink: make zink_descriptor_util_push_layouts_get() static Part-of: --- src/gallium/drivers/zink/zink_descriptors.c | 12 ++++++------ src/gallium/drivers/zink/zink_descriptors.h | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/gallium/drivers/zink/zink_descriptors.c b/src/gallium/drivers/zink/zink_descriptors.c index 39030d1e7ba..d53323f6d26 100644 --- a/src/gallium/drivers/zink/zink_descriptors.c +++ b/src/gallium/drivers/zink/zink_descriptors.c @@ -257,17 +257,17 @@ create_gfx_layout(struct zink_context *ctx, struct zink_descriptor_layout_key ** return create_layout(screen, dsl_type, bindings, fbfetch ? ARRAY_SIZE(bindings) : ARRAY_SIZE(bindings) - 1, layout_key); } -bool -zink_descriptor_util_push_layouts_get(struct zink_context *ctx, struct zink_descriptor_layout **dsls, struct zink_descriptor_layout_key **layout_keys) +static bool +zink_descriptor_util_push_layouts_get(struct zink_context *ctx) { struct zink_screen *screen = zink_screen(ctx->base.screen); VkDescriptorSetLayoutBinding compute_binding; enum zink_descriptor_type dsl_type; VkDescriptorType vktype = get_push_types(screen, &dsl_type); init_push_binding(&compute_binding, MESA_SHADER_COMPUTE, vktype); - dsls[0] = create_gfx_layout(ctx, &layout_keys[0], false); - dsls[1] = create_layout(screen, dsl_type, &compute_binding, 1, &layout_keys[1]); - return dsls[0] && dsls[1]; + ctx->dd.push_dsl[0] = create_gfx_layout(ctx, &ctx->dd.push_layout_keys[0], false); + ctx->dd.push_dsl[1] = create_layout(screen, dsl_type, &compute_binding, 1, &ctx->dd.push_layout_keys[1]); + return ctx->dd.push_dsl[0] && ctx->dd.push_dsl[1]; } VkImageLayout @@ -1635,7 +1635,7 @@ zink_descriptors_init(struct zink_context *ctx) entry->offset = offsetof(struct zink_context, di.fbfetch); entry->stride = sizeof(VkDescriptorImageInfo); struct zink_descriptor_layout_key *layout_key; - if (!zink_descriptor_util_push_layouts_get(ctx, ctx->dd.push_dsl, ctx->dd.push_layout_keys)) + if (!zink_descriptor_util_push_layouts_get(ctx)) return false; ctx->dd.dummy_dsl = descriptor_util_layout_get(screen, 0, NULL, 0, &layout_key); diff --git a/src/gallium/drivers/zink/zink_descriptors.h b/src/gallium/drivers/zink/zink_descriptors.h index 1cb9d20d593..9404027973f 100644 --- a/src/gallium/drivers/zink/zink_descriptors.h +++ b/src/gallium/drivers/zink/zink_descriptors.h @@ -143,8 +143,6 @@ bool zink_descriptor_util_alloc_sets(struct zink_screen *screen, VkDescriptorSetLayout dsl, VkDescriptorPool pool, VkDescriptorSet *sets, unsigned num_sets); void zink_descriptor_util_init_fbfetch(struct zink_context *ctx); -bool -zink_descriptor_util_push_layouts_get(struct zink_context *ctx, struct zink_descriptor_layout **dsls, struct zink_descriptor_layout_key **layout_keys); VkImageLayout zink_descriptor_util_image_layout_eval(const struct zink_context *ctx, const struct zink_resource *res, bool is_compute); void