From f43eac3ed8772c13df448c4ce5b566458ab0154b Mon Sep 17 00:00:00 2001 From: Brian Date: Thu, 18 Jan 2007 09:22:44 -0700 Subject: remove swizzle param from new_var() --- src/mesa/shader/slang/slang_codegen.c | 10 +++++----- 1 file 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); */ -- cgit v1.2.3