Module: Mesa Branch: master Commit: da5ec2ac0bc20b52fefe59081efcdb9b3989f6a7 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=da5ec2ac0bc20b52fefe59081efcdb9b3989f6a7
Author: Kenneth Graunke <[email protected]> Date: Sat Mar 28 00:02:37 2015 -0700 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 <[email protected]> Reviewed-by: Jason Ekstrand <[email protected]> --- src/glsl/nir/nir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glsl/nir/nir.c b/src/glsl/nir/nir.c index 73d3008..5f86eca 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); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
