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

zink: more effectively synchronize separate shader program precompiles

Browse Source 
this avoids a race condition that could occur if a shader used by a
precompile was destroyed between creating the full_prog and the full_prog's
shader generation

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28955>
This commit is contained in:
Mike Blumenkrantz
2024-05-03 10:42:37 -04:00
committed by Marge Bot
parent 27fe924cf0
commit b6b91a3ed9
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gallium/drivers/zink/zink_program.c
View File

@@ -1184,10 +1184,18 @@ static void
create_linked_separable_job(void *data, void *gdata, int thread_index)
{
struct zink_gfx_program *prog = data;
/* this is a dead program */
if (prog->base.removed)
return;
prog->full_prog = zink_create_gfx_program(prog->base.ctx, prog->shaders, 0, prog->gfx_hash);
/* block gfx_shader_prune in the main thread */
util_queue_fence_reset(&prog->full_prog->base.cache_fence);
/* add an ownership ref */
zink_gfx_program_reference(zink_screen(prog->base.ctx->base.screen), NULL, prog->full_prog);
precompile_job(prog->full_prog, gdata, thread_index);
/* this is otherwise a dead program */
if (prog->full_prog->stages_present == prog->full_prog->stages_remaining)
precompile_job(prog->full_prog, gdata, thread_index);
util_queue_fence_signal(&prog->full_prog->base.cache_fence);
}
struct zink_gfx_program *