Mesa (staging/21.2): zink: free local shader nirs on program free

[GitLab Mirror]

Module: Mesa
Branch: staging/21.2
Commit: 179a29182650286df8e15cbccba04fc894f5df1f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=179a29182650286df8e15cbccba04fc894f5df1f

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Mon Aug 30 11:30:46 2021 -0400

zink: free local shader nirs on program free

leak--

Fixes: 61f2667cf5d ("zink: remove gfx program slot mapping")

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12630>
(cherry picked from commit 441018a173fbeca0eeb5fe532af8c84965331c73)

---

 .pick_status.json                       | 2 +-
 src/gallium/drivers/zink/zink_program.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 3c43c3f8c4a..3514a1cc1f9 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -112,7 +112,7 @@
         "description": "zink: free local shader nirs on program free",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "61f2667cf5da6fd1a6d957761c8e244c1bc0da35"
     },
diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c
index 9245869835a..1314c5f06d8 100644
--- a/src/gallium/drivers/zink/zink_program.c
+++ b/src/gallium/drivers/zink/zink_program.c
@@ -681,6 +681,7 @@ zink_destroy_gfx_program(struct zink_screen *screen,
          prog->shaders[i] = NULL;
          destroy_shader_cache(screen, &prog->base.shader_cache[i]);
       }
+      ralloc_free(prog->nir[i]);
    }
 
    for (int i = 0; i < ARRAY_SIZE(prog->pipelines); ++i) {