fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-31 20:40:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: simplify some update_descriptor code

Browse source 
by using the generic zink_program here we can shorten the code a little

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9348>
This commit is contained in:
Mike Blumenkrantz 2020-11-27 12:16:47 -05:00 • committed by Marge Bot
parent 15fc0c351a
commit 5ddfffcca1
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gallium/drivers/zink/zink_draw.c
View file

@ -508,15 +508,12 @@ update_descriptors(struct zink_context *ctx, struct zink_screen *screen, bool is
}
unsigned num_descriptors;
VkDescriptorSetLayout dsl;
if (is_compute) {
num_descriptors = ctx->curr_compute->base.num_descriptors;
dsl = ctx->curr_compute->base.dsl;
batch = &ctx->compute_batch;
} else {
batch = zink_curr_batch(ctx);
num_descriptors = ctx->curr_program->base.num_descriptors;
dsl = ctx->curr_program->base.dsl;
}
if (batch->descs_used + num_descriptors >= batch->max_descs) {
@ -528,13 +525,12 @@ update_descriptors(struct zink_context *ctx, struct zink_screen *screen, bool is
batch = zink_curr_batch(ctx);
}
}
if (is_compute)
zink_batch_reference_program(batch, &ctx->curr_compute->base);
else
zink_batch_reference_program(batch, &ctx->curr_program->base);
struct zink_program *pg = is_compute ? &ctx->curr_compute->base : &ctx->curr_program->base;
zink_batch_reference_program(batch, pg);
VkDescriptorSet desc_set = allocate_descriptor_set(screen, batch,
dsl, num_descriptors);
pg->dsl, num_descriptors);
/* probably oom, so we need to stall until we free up some descriptors */
if (!desc_set) {
/* update our max descriptor count so we can try and avoid this happening again */
@ -557,7 +553,7 @@ update_descriptors(struct zink_context *ctx, struct zink_screen *screen, bool is
zink_reset_batch(ctx, &ctx->batches[i]);
}
}
desc_set = allocate_descriptor_set(screen, batch, dsl, num_descriptors);
desc_set = allocate_descriptor_set(screen, batch, pg->dsl, num_descriptors);
}
assert(desc_set != VK_NULL_HANDLE);