Mesa (main): zink: unset generated tcs pointer from tes on deletion

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: cf34d3fe05004c66145a6faf39c8883b71861c8c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cf34d3fe05004c66145a6faf39c8883b71861c8c

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Tue Jun  7 14:26:02 2022 -0400

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 at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17010>

---

 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);
       }
    }