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

zink: deduplicate separable program replacement handling

Browse Source 
no functional changes

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22725>
This commit is contained in:
Mike Blumenkrantz
2023-04-03 14:16:56 -04:00
committed by Marge Bot
parent 9d112791a5
commit 5922c2efa9
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/zink_program.c
+15 -16
View File
@@ -691,6 +691,19 @@ update_gfx_program_optimal(struct zink_context *ctx, struct zink_gfx_program *pr
prog->last_variant_hash = ctx->gfx_pipeline_state.shader_keys_optimal.key.val;
}
static struct zink_gfx_program *
replace_separable_prog(struct zink_screen *screen, struct hash_entry *entry, struct zink_gfx_program *prog)
{
struct zink_gfx_program *real = prog->full_prog;
entry->data = real;
entry->key = real->shaders;
real->base.removed = false;
prog->full_prog = NULL;
prog->base.removed = true;
zink_gfx_program_reference(screen, &prog, NULL);
return real;
}
void
zink_gfx_program_update_optimal(struct zink_context *ctx)
{
@@ -713,14 +726,7 @@ zink_gfx_program_update_optimal(struct zink_context *ctx)
util_queue_fence_wait(&prog->base.cache_fence);
/* If the optimized linked pipeline is done compiling, swap it into place. */
if (util_queue_fence_is_signalled(&prog->base.cache_fence)) {
struct zink_gfx_program *real = prog->full_prog;
entry->data = real;
entry->key = real->shaders;
real->base.removed = false;
prog->full_prog = NULL;
prog->base.removed = true;
zink_gfx_program_reference(screen, &prog, NULL);
prog = real;
prog = replace_separable_prog(screen, entry, prog);
}
}
update_gfx_program_optimal(ctx, prog);
@@ -752,14 +758,7 @@ zink_gfx_program_update_optimal(struct zink_context *ctx)
const uint32_t hash = ctx->gfx_hash;
simple_mtx_lock(&ctx->program_lock[zink_program_cache_stages(ctx->shader_stages)]);
struct hash_entry *entry = _mesa_hash_table_search_pre_hashed(ht, hash, ctx->gfx_stages);
struct zink_gfx_program *real = prog->full_prog;
entry->data = real;
entry->key = real->shaders;
real->base.removed = false;
prog->full_prog = NULL;
prog->base.removed = true;
zink_gfx_program_reference(screen, &prog, NULL);
ctx->curr_program = real;
ctx->curr_program = replace_separable_prog(screen, entry, prog);
simple_mtx_unlock(&ctx->program_lock[zink_program_cache_stages(ctx->shader_stages)]);
}
}