fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-01 15:30:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: reorder some code in zink_create_gfx_program()

Browse source 
no functional changes

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28955>
This commit is contained in:
Mike Blumenkrantz 2024-04-25 07:51:02 -04:00 • committed by Marge Bot
parent 921fbac6a3
commit 7d849da0fd
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/gallium/drivers/zink/zink_program.c
View file

@ -1123,14 +1123,15 @@ zink_create_gfx_program(struct zink_context *ctx,
prog->stages_present |= BITFIELD_BIT(MESA_SHADER_TESS_CTRL);
}
prog->stages_remaining = prog->stages_present;
assign_io(screen, nir);
for (unsigned i = 0; i < ZINK_GFX_SHADER_COUNT; i++) {
if (nir[i])
zink_shader_serialize_blob(nir[i], &prog->blobs[i]);
ralloc_free(nir[i]);
for (int i = 0; i < ZINK_GFX_SHADER_COUNT; ++i) {
if (prog->shaders[i]) {
simple_mtx_lock(&prog->shaders[i]->lock);
_mesa_set_add(prog->shaders[i]->programs, prog);
simple_mtx_unlock(&prog->shaders[i]->lock);
zink_gfx_program_reference(screen, NULL, prog);
}
}
p_atomic_dec(&prog->base.reference.count);
if (stages[MESA_SHADER_GEOMETRY])
prog->last_vertex_stage = stages[MESA_SHADER_GEOMETRY];
@ -1149,6 +1150,13 @@ zink_create_gfx_program(struct zink_context *ctx,
}
}
assign_io(screen, nir);
for (unsigned i = 0; i < ZINK_GFX_SHADER_COUNT; i++) {
if (nir[i])
zink_shader_serialize_blob(nir[i], &prog->blobs[i]);
ralloc_free(nir[i]);
}
if (screen->optimal_keys)
prog->libs = find_or_create_lib_cache(screen, prog);
if (prog->libs)
@ -1157,16 +1165,10 @@ zink_create_gfx_program(struct zink_context *ctx,
struct mesa_sha1 sctx;
_mesa_sha1_init(&sctx);
for (int i = 0; i < ZINK_GFX_SHADER_COUNT; ++i) {
if (prog->shaders[i]) {
simple_mtx_lock(&prog->shaders[i]->lock);
_mesa_set_add(prog->shaders[i]->programs, prog);
simple_mtx_unlock(&prog->shaders[i]->lock);
zink_gfx_program_reference(screen, NULL, prog);
if (prog->shaders[i])
_mesa_sha1_update(&sctx, prog->shaders[i]->base.sha1, sizeof(prog->shaders[i]->base.sha1));
}
}
_mesa_sha1_final(&sctx, prog->base.sha1);
p_atomic_dec(&prog->base.reference.count);
if (!zink_descriptor_program_init(ctx, &prog->base))
goto fail;