summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2007-01-18 09:22:44 -0700
committerBrian <brian@yutani.localnet.net>2007-01-18 09:22:44 -0700
commitf43eac3ed8772c13df448c4ce5b566458ab0154b (patch)
treea4aa70e17a753a6fb921badc3b7b81be5f64fc1b
parent8a2368edce9531e1b17a604b136ae2709f215b31 (diff)
remove swizzle param from new_var()
-rw-r--r--src/mesa/shader/slang/slang_codegen.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index 15c05a39a2..85f1f0ccfd 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -581,9 +581,9 @@ new_jump(slang_atom target)
* New IR_VAR node - a reference to a previously declared variable.
*/
static slang_ir_node *
-new_var(slang_assemble_ctx *A, slang_operation *oper,
- slang_atom name, GLuint swizzle)
+new_var(slang_assemble_ctx *A, slang_operation *oper, slang_atom name)
{
+ GLuint swizzle = SWIZZLE_NOOP;
slang_variable *v = _slang_locate_variable(oper->locals, name, GL_TRUE);
slang_ir_node *n = new_node(IR_VAR, NULL, NULL);
if (!v) {
@@ -1728,7 +1728,7 @@ _slang_gen_declaration(slang_assemble_ctx *A, slang_operation *oper)
/* child is initializer */
slang_ir_node *var, *init, *rhs;
assert(oper->num_children == 1);
- var = new_var(A, oper, oper->a_id, SWIZZLE_NOOP);
+ var = new_var(A, oper, oper->a_id);
/* XXX make copy of this initializer? */
/*
printf("\n*** ASSEMBLE INITIALIZER %p\n", (void*) v->initializer);
@@ -1741,7 +1741,7 @@ _slang_gen_declaration(slang_assemble_ctx *A, slang_operation *oper)
}
else if (v->initializer) {
slang_ir_node *var, *init, *rhs;
- var = new_var(A, oper, oper->a_id, SWIZZLE_NOOP);
+ var = new_var(A, oper, oper->a_id);
/* XXX make copy of this initializer? */
/*
printf("\n*** ASSEMBLE INITIALIZER %p\n", (void*) v->initializer);
@@ -1771,7 +1771,7 @@ _slang_gen_variable(slang_assemble_ctx * A, slang_operation *oper)
* use it. Otherwise, use the oper's var id.
*/
slang_atom aVar = oper->var ? oper->var->a_name : oper->a_id;
- slang_ir_node *n = new_var(A, oper, aVar, SWIZZLE_NOOP);
+ slang_ir_node *n = new_var(A, oper, aVar);
/*
assert(oper->var);
*/