Mesa (staging/22.1): zink: unset generated tcs pointer from tes on deletion

[GitLab Mirror]

Module: Mesa
Branch: staging/22.1
Commit: 5f9e92dc4d6a0e91c27de4a8639d92c06d74e135
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f9e92dc4d6a0e91c27de4a8639d92c06d74e135

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>
(cherry picked from commit cf34d3fe05004c66145a6faf39c8883b71861c8c)

---

 .pick_status.json                        | 2 +-
 src/gallium/drivers/zink/zink_compiler.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 487f6b9ae57..bcb0725f6fb 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1192,7 +1192,7 @@
         "description": "zink: unset generated tcs pointer from tes on deletion",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c
index 167150efa95..87ca8933df7 100644
--- a/src/gallium/drivers/zink/zink_compiler.c
+++ b/src/gallium/drivers/zink/zink_compiler.c
@@ -2239,9 +2239,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);
       }
    }