From: Eric Anholt <eric@anholt.net>
Date: Wed, 7 Apr 2010 22:18:37 +0000 (-0700)
Subject: Make dot() take the right number of args.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6173312d84daabaf6dbe8fa15558cba4c9cb9f5e;p=mesa.git

Make dot() take the right number of args.
---

diff --git a/builtin_function.cpp b/builtin_function.cpp
index ec6fd1b11a3..9cefbd4ae5f 100644
--- a/builtin_function.cpp
+++ b/builtin_function.cpp
@@ -311,12 +311,13 @@ generate_dot(exec_list *instructions,
 		ir_variable **declarations,
 		const glsl_type *type)
 {
-   ir_dereference *const arg = new ir_dereference(declarations[0]);
+   ir_dereference *const arg0 = new ir_dereference(declarations[0]);
+   ir_dereference *const arg1 = new ir_dereference(declarations[1]);
    ir_rvalue *result;
 
    (void)type;
 
-   result = new ir_expression(ir_binop_dot, glsl_type::float_type, arg, arg);
+   result = new ir_expression(ir_binop_dot, glsl_type::float_type, arg0, arg1);
 
    ir_instruction *inst = new ir_return(result);
    instructions->push_tail(inst);
@@ -335,13 +336,13 @@ generate_dot_functions(glsl_symbol_table *symtab, exec_list *instructions)
    bool added = symtab->add_function(name, f);
    assert(added);
 
-   generate_function_instance(f, name, instructions, 1, generate_dot,
+   generate_function_instance(f, name, instructions, 2, generate_dot,
 			      float_type, float_type);
-   generate_function_instance(f, name, instructions, 1, generate_dot,
+   generate_function_instance(f, name, instructions, 2, generate_dot,
 			      float_type, vec2_type);
-   generate_function_instance(f, name, instructions, 1, generate_dot,
+   generate_function_instance(f, name, instructions, 2, generate_dot,
 			      float_type, vec3_type);
-   generate_function_instance(f, name, instructions, 1, generate_dot,
+   generate_function_instance(f, name, instructions, 2, generate_dot,
 			      float_type, vec4_type);
 }