Make dot() take the right number of args.
authorEric Anholt <eric@anholt.net>
Wed, 7 Apr 2010 22:18:37 +0000 (15:18 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Thu, 8 Apr 2010 00:23:23 +0000 (17:23 -0700)
builtin_function.cpp

index ec6fd1b11a3e7902c3925c5e70d29d816d3e8b49..9cefbd4ae5f5b08214d66f55575b568ea8700b8b 100644 (file)
@@ -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);
 }