From 87a3240d5754882ef8aa6502ac7aa711c307befb Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason.ekstrand@collabora.com>
Date: Fri, 27 May 2022 13:53:07 -0500
Subject: [PATCH] glsl/nir: Stop leaking varyings_info
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: 34b3b92bbee1 ("nir/xfb: move varyings info out of nir_xfb_info")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16750>
(cherry picked from commit 36d8a2f1d7ed0b1778756481940a73f348de9367)
---
 .pick_status.json                   | 4 ++--
 src/compiler/glsl/gl_nir_link_xfb.c | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index d673ba87720..8f61d418a64 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -553,7 +553,7 @@
         "description": "glsl/nir: Stop leaking varyings_info",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "34b3b92bbee1f68a9c121cd26e30e113c8cd39a8"
     },
@@ -886,7 +886,7 @@
         "description": "zink: lower subgroup width to 1 for unsupported subgroup vote stages",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
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);
 }