From: Eric Anholt <eric@anholt.net>
Date: Wed, 18 Aug 2010 20:48:32 +0000 (-0700)
Subject: ir_to_mesa: Stop leaking the ir_instruction * annotation of our compile.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=850c659044d081c53713800cacf8d518fae6cd70;p=mesa.git

ir_to_mesa: Stop leaking the ir_instruction * annotation of our compile.
---

diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index 394370d46d4..5299d7706c9 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -2412,7 +2412,6 @@ struct gl_program *
 get_mesa_program(GLcontext *ctx, struct gl_shader_program *shader_program,
 		 struct gl_shader *shader)
 {
-   void *mem_ctx = shader_program;
    ir_to_mesa_visitor v;
    struct prog_instruction *mesa_instructions, *mesa_inst;
    ir_instruction **mesa_instruction_annotation;
@@ -2490,7 +2489,7 @@ get_mesa_program(GLcontext *ctx, struct gl_shader_program *shader_program,
    mesa_instructions =
       (struct prog_instruction *)calloc(num_instructions,
 					sizeof(*mesa_instructions));
-   mesa_instruction_annotation = talloc_array(mem_ctx, ir_instruction *,
+   mesa_instruction_annotation = talloc_array(v.mem_ctx, ir_instruction *,
 					      num_instructions);
 
    mesa_inst = mesa_instructions;