summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2010-06-25 13:36:14 -0700
committerIan Romanick <ian.d.romanick@intel.com>2010-06-30 13:52:24 -0700
commitc6099a65f8f8310a540f7c19cfc380ad980c9dd7 (patch)
treef96564947346840b58835f33e4ae8878314f555b
parent953ff1283d3d52e6a6b4850c2b0b574111625010 (diff)
glsl2: Create new talloc contexts the "right" way.
-rw-r--r--src/glsl/ir_copy_propagation.cpp2
-rw-r--r--src/glsl/ir_dead_code_local.cpp2
2 files changed, 2 insertions, 2 deletions
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) {