summaryrefslogtreecommitdiff
path: root/src/glsl/ast_function.cpp
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2010-08-03 20:05:53 -0700
committerKenneth Graunke <kenneth@whitecape.org>2010-08-04 15:57:19 -0700
commitad98aa9d93646600cc95b3e45a40eec26f18988a (patch)
treeacf5fabf216947bd9529c68edbc0bb3fdaa0f870 /src/glsl/ast_function.cpp
parentea3a9eb53a3c9ed99998ead645e2b2e6a3261626 (diff)
glsl2: Remove uses of deprecated TALLOC_CTX type.
Diffstat (limited to 'src/glsl/ast_function.cpp')
-rw-r--r--src/glsl/ast_function.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/glsl/ast_function.cpp b/src/glsl/ast_function.cpp
index 661f8f6160..c22dfa81eb 100644
--- a/src/glsl/ast_function.cpp
+++ b/src/glsl/ast_function.cpp
@@ -629,20 +629,20 @@ emit_inline_vector_constructor(const glsl_type *type,
ir_instruction *
assign_to_matrix_column(ir_variable *var, unsigned column, unsigned row_base,
ir_rvalue *src, unsigned src_base, unsigned count,
- TALLOC_CTX *ctx)
+ void *mem_ctx)
{
const unsigned mask[8] = { 0, 1, 2, 3, 0, 0, 0, 0 };
- ir_constant *col_idx = new(ctx) ir_constant(column);
- ir_rvalue *column_ref = new(ctx) ir_dereference_array(var, col_idx);
+ ir_constant *col_idx = new(mem_ctx) ir_constant(column);
+ ir_rvalue *column_ref = new(mem_ctx) ir_dereference_array(var, col_idx);
assert(column_ref->type->components() >= (row_base + count));
- ir_rvalue *lhs = new(ctx) ir_swizzle(column_ref, &mask[row_base], count);
+ ir_rvalue *lhs = new(mem_ctx) ir_swizzle(column_ref, &mask[row_base], count);
assert(src->type->components() >= (src_base + count));
- ir_rvalue *rhs = new(ctx) ir_swizzle(src, &mask[src_base], count);
+ ir_rvalue *rhs = new(mem_ctx) ir_swizzle(src, &mask[src_base], count);
- return new(ctx) ir_assignment(lhs, rhs, NULL);
+ return new(mem_ctx) ir_assignment(lhs, rhs, NULL);
}