From: Kenneth Graunke <kenneth@whitecape.org>
Date: Sat, 28 Mar 2015 07:02:37 +0000 (-0700)
Subject: nir: Allocate nir_tex_instr::sources out of the instruction itself.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=da5ec2a;p=mesa.git

nir: Allocate nir_tex_instr::sources out of the instruction itself.

The lifetime of the sources array needs to be match the nir_tex_instr
itself.  So, allocate it using the instruction itself as the context.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
---

diff --git a/src/glsl/nir/nir.c b/src/glsl/nir/nir.c
index 73d3008a0b3..5f86ecaa202 100644
--- a/src/glsl/nir/nir.c
+++ b/src/glsl/nir/nir.c
@@ -460,7 +460,7 @@ nir_tex_instr_create(void *mem_ctx, unsigned num_srcs)
    dest_init(&instr->dest);
 
    instr->num_srcs = num_srcs;
-   instr->src = ralloc_array(mem_ctx, nir_tex_src, num_srcs);
+   instr->src = ralloc_array(instr, nir_tex_src, num_srcs);
    for (unsigned i = 0; i < num_srcs; i++)
       src_init(&instr->src[i].src);