From: Kenneth Graunke <kenneth@whitecape.org>
Date: Fri, 25 Jun 2010 20:36:14 +0000 (-0700)
Subject: glsl2: Create new talloc contexts the "right" way.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c6099a65f8f8310a540f7c19cfc380ad980c9dd7;p=mesa.git

glsl2: Create new talloc contexts the "right" way.
---

diff --git a/src/glsl/ir_copy_propagation.cpp b/src/glsl/ir_copy_propagation.cpp
index a02852ed0cc..f502f5e0b06 100644
--- a/src/glsl/ir_copy_propagation.cpp
+++ b/src/glsl/ir_copy_propagation.cpp
@@ -225,7 +225,7 @@ copy_propagation_basic_block(ir_instruction *first,
    bool *out_progress = (bool *)data;
    bool progress = false;
 
-   void *ctx = talloc(NULL, void*);
+   void *ctx = talloc_new(NULL);
    for (ir = first;; ir = (ir_instruction *)ir->next) {
       ir_assignment *ir_assign = ir->as_assignment();
 
diff --git a/src/glsl/ir_dead_code_local.cpp b/src/glsl/ir_dead_code_local.cpp
index 5e197e19484..7a44ec8a4a4 100644
--- a/src/glsl/ir_dead_code_local.cpp
+++ b/src/glsl/ir_dead_code_local.cpp
@@ -185,7 +185,7 @@ dead_code_local_basic_block(ir_instruction *first,
    bool *out_progress = (bool *)data;
    bool progress = false;
 
-   void *ctx = talloc(NULL, void*);
+   void *ctx = talloc_new(NULL);
    /* Safe looping, since process_assignment */
    for (ir = first, ir_next = (ir_instruction *)first->next;;
 	ir = ir_next, ir_next = (ir_instruction *)ir->next) {