From cf34d3fe05004c66145a6faf39c8883b71861c8c Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 7 Jun 2022 14:26:02 -0400 Subject: [PATCH] zink: unset generated tcs pointer from tes on deletion otherwise this will free the generated tcs multiple times if the tes is used by multiple programs cc: mesa-stable Reviewed-by: Adam Jackson Part-of: --- src/gallium/drivers/zink/zink_compiler.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c index d62d62113c8..a02232add52 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -2897,9 +2897,11 @@ zink_shader_free(struct zink_context *ctx, struct zink_shader *shader) prog->base.removed = true; } prog->shaders[pstage] = NULL; - if (shader->nir->info.stage == MESA_SHADER_TESS_EVAL && shader->generated) + if (shader->nir->info.stage == MESA_SHADER_TESS_EVAL && shader->generated) { /* automatically destroy generated tcs shaders when tes is destroyed */ zink_shader_free(ctx, shader->generated); + shader->generated = NULL; + } zink_gfx_program_reference(ctx, &prog, NULL); } }