summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@collabora.com>2022-05-27 13:53:07 -0500
committerDylan Baker <dylan.c.baker@intel.com>2022-06-01 13:18:43 -0700
commitecaf537168e56082d81cb90c62b01aa1dd1efaf1 (patch)
treee35f88a5f6460bbd6ad33445c1de9fb06f38473e
parentd1868166102f9d45e4aab10f64a832ff5b96a737 (diff)
downloadmesa-ecaf537168e56082d81cb90c62b01aa1dd1efaf1.tar.gz
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@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)
-rw-r--r--.pick_status.json2
-rw-r--r--src/compiler/glsl/gl_nir_link_xfb.c1
2 files changed, 2 insertions, 1 deletions
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);
}