Mesa (master): ir_to_mesa: Stop leaking the ir_instruction * annotation of our compile.

Eric Anholt anholt at kemper.freedesktop.org
Wed Aug 18 21:20:37 UTC 2010


Module: Mesa
Branch: master
Commit: 850c659044d081c53713800cacf8d518fae6cd70
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=850c659044d081c53713800cacf8d518fae6cd70

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Aug 18 13:48:32 2010 -0700

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

---

 src/mesa/program/ir_to_mesa.cpp |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index 394370d..5299d77 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;




More information about the mesa-commit mailing list