fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-03 20:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

zink: move descriptor set allocation near the top of update_descriptors

Browse source 
no functional changes, but it moves the only point in the function where a
flush can occur out of the way which lets us get the batch we'll be using
immediately

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-10-04 10:53:14 -04:00 • committed by Marge Bot
parent 514b5ced97
commit 9df3147264
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -342,6 +342,15 @@ update_descriptors(struct zink_context *ctx, struct zink_screen *screen, bool is
stages = &ctx->gfx_stages[0];
zink_context_update_descriptor_states(ctx, is_compute);
bool cache_hit[ZINK_DESCRIPTOR_TYPES];
struct zink_descriptor_set *zds[ZINK_DESCRIPTOR_TYPES];
for (int h = 0; h < ZINK_DESCRIPTOR_TYPES; h++) {
if (pg->dsl[h])
zds[h] = get_descriptor_set(ctx, is_compute, h, &cache_hit[h]);
else
zds[h] = NULL;
}
struct zink_batch *batch = is_compute ? &ctx->compute_batch : zink_curr_batch(ctx);
struct zink_transition transitions[num_bindings];
int num_transitions = 0;
@ -537,17 +546,6 @@ update_descriptors(struct zink_context *ctx, struct zink_screen *screen, bool is
for (int i = 0; i < dynamic_offset_idx; i++)
dynamic_offsets[i] = dynamic_buffers[i].offset;
struct zink_batch *batch = NULL;
bool cache_hit[ZINK_DESCRIPTOR_TYPES];
struct zink_descriptor_set *zds[ZINK_DESCRIPTOR_TYPES];
for (int h = 0; h < ZINK_DESCRIPTOR_TYPES; h++) {
if (pg->dsl[h])
zds[h] = get_descriptor_set(ctx, is_compute, h, &cache_hit[h]);
else
zds[h] = NULL;
}
batch = is_compute ? &ctx->compute_batch : zink_curr_batch(ctx);
unsigned check_flush_id = is_compute ? 0 : ZINK_COMPUTE_BATCH_ID;
bool need_flush = false;
for (int h = 0; h < ZINK_DESCRIPTOR_TYPES; h++) {