Mesa (staging/22.0): glsl/nir: Stop leaking varyings_info

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: ecaf537168e56082d81cb90c62b01aa1dd1efaf1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ecaf537168e56082d81cb90c62b01aa1dd1efaf1

Author: Jason Ekstrand <jason.ekstrand at collabora.com>
Date:   Fri May 27 13:53:07 2022 -0500

glsl/nir: Stop leaking varyings_info

Fixes: 34b3b92bbee1 ("nir/xfb: move varyings info out of nir_xfb_info")
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Reviewed-by: Alyssa Rosenzweig <alyssa at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16750>
(cherry picked from commit 36d8a2f1d7ed0b1778756481940a73f348de9367)

---

 .pick_status.json                   | 2 +-
 src/compiler/glsl/gl_nir_link_xfb.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index e5b2f6c47ca..566f5d25e6a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -492,7 +492,7 @@
         "description": "glsl/nir: Stop leaking varyings_info",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": "34b3b92bbee1f68a9c121cd26e30e113c8cd39a8"
     },
     {
diff --git a/src/compiler/glsl/gl_nir_link_xfb.c b/src/compiler/glsl/gl_nir_link_xfb.c
index 98cc998a077..f88d9e5309e 100644
--- a/src/compiler/glsl/gl_nir_link_xfb.c
+++ b/src/compiler/glsl/gl_nir_link_xfb.c
@@ -193,4 +193,5 @@ gl_nir_link_assign_xfb_resources(const struct gl_constants *consts,
    linked_xfb->ActiveBuffers = buffers;
 
    ralloc_free(xfb_info);
+   ralloc_free(varyings_info);
 }