diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2022-06-07 14:26:02 -0400 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-06-14 19:21:15 +0000 |
| commit | cf34d3fe05004c66145a6faf39c8883b71861c8c (patch) | |
| tree | 937079fc7e5bff2f760411fa5c18910b82e0a932 | |
| parent | c36c5ff057aa6c65e0beb75810c91aea1499634a (diff) | |
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 <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17010>
| -rw-r--r-- | src/gallium/drivers/zink/zink_compiler.c | 4 |
1 files changed, 3 insertions, 1 deletions
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); } } |