KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zink: simplify get_descriptor_set_lazy params 

Reviewed-by: Hoe Hao Cheng <haochengho12907@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12427>
This commit is contained in:
Mike Blumenkrantz 2021-05-21 17:39:30 -04:00 committed by Marge Bot
parent 35c3f5f08b
commit 96a6b8c808
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gallium/drivers/zink/zink_descriptors_lazy.c
View File

@ -394,7 +394,7 @@ get_descriptor_pool_lazy(struct zink_context *ctx, struct zink_program *pg, enum
}
ALWAYS_INLINE static VkDescriptorSet
get_descriptor_set_lazy(struct zink_context *ctx, struct zink_program *pg, enum zink_descriptor_type type, struct zink_descriptor_pool *pool, bool is_compute)
get_descriptor_set_lazy(struct zink_descriptor_pool *pool)
{
if (!pool)
return VK_NULL_HANDLE;
@ -409,7 +409,7 @@ populate_sets(struct zink_context *ctx, struct zink_program *pg, uint8_t *change
struct zink_batch_state *bs = ctx->batch.state;
if (need_push && !zink_screen(ctx->base.screen)->info.have_KHR_push_descriptor) {
struct zink_descriptor_pool *pool = check_push_pool_alloc(ctx, bdd_lazy(bs)->push_pool[pg->is_compute], bs, pg->is_compute);
sets[0] = get_descriptor_set_lazy(ctx, NULL, 0, pool, pg->is_compute);
sets[0] = get_descriptor_set_lazy(pool);
if (!sets[0])
return false;
} else
@ -420,7 +420,7 @@ populate_sets(struct zink_context *ctx, struct zink_program *pg, uint8_t *change
u_foreach_bit(type, *changed_sets) {
if (pg->dd->layout_key[type]) {
struct zink_descriptor_pool *pool = get_descriptor_pool_lazy(ctx, pg, type, bs, pg->is_compute);
sets[type + 1] = get_descriptor_set_lazy(ctx, pg, type, pool, pg->is_compute);
sets[type + 1] = get_descriptor_set_lazy(pool);
/* no flushing allowed */
assert(ctx->batch.state == bs);
} else