Module: Mesa Branch: main Commit: 115e0446dcd7b020a0d96b3939e8050a29a80c2e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=115e0446dcd7b020a0d96b3939e8050a29a80c2e
Author: Mike Blumenkrantz <[email protected]> Date: Mon Feb 6 15:13:29 2023 -0500 zink: pass screen to descriptor_util_pool_key_get() Reviewed-by: Emma Anholt <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21169> --- src/gallium/drivers/zink/zink_descriptors.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/zink/zink_descriptors.c b/src/gallium/drivers/zink/zink_descriptors.c index bfa2c07c7d4..bb40deaa33c 100644 --- a/src/gallium/drivers/zink/zink_descriptors.c +++ b/src/gallium/drivers/zink/zink_descriptors.c @@ -179,11 +179,10 @@ equals_descriptor_pool_key(const void *a, const void *b) } static struct zink_descriptor_pool_key * -descriptor_util_pool_key_get(struct zink_context *ctx, enum zink_descriptor_type type, +descriptor_util_pool_key_get(struct zink_screen *screen, enum zink_descriptor_type type, struct zink_descriptor_layout_key *layout_key, VkDescriptorPoolSize *sizes, unsigned num_type_sizes) { - struct zink_screen *screen = zink_screen(ctx->base.screen); uint32_t hash = 0; struct zink_descriptor_pool_key key; key.num_type_sizes = num_type_sizes; @@ -593,7 +592,7 @@ zink_descriptor_program_init(struct zink_context *ctx, struct zink_program *pg) if (!sz->descriptorCount) sz++; } - pg->dd.pool_key[desc_type] = descriptor_util_pool_key_get(ctx, desc_type, key, sz, num_type_sizes[desc_type]); + pg->dd.pool_key[desc_type] = descriptor_util_pool_key_get(screen, desc_type, key, sz, num_type_sizes[desc_type]); pg->dd.pool_key[desc_type]->use_count++; pg->dsl[pg->num_dsl] = pg->dd.layouts[pg->num_dsl]->layout; if (zink_descriptor_mode == ZINK_DESCRIPTOR_MODE_DB)
