From cc49cea9eab0dc46ee04d109f42814c4a0581c04 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 8 Apr 2010 15:10:37 -0700 Subject: [PATCH] Add support for builtin gentype mix(gentype a, gentype b) Fixes glsl-fs-mix.frag, glsl-fs-mix-constant.frag. --- builtin_function.cpp | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/builtin_function.cpp b/builtin_function.cpp index 9869f70597e..c83bdd0a2c5 100644 --- a/builtin_function.cpp +++ b/builtin_function.cpp @@ -187,6 +187,26 @@ generate_max(exec_list *instructions, generate_binop(instructions, declarations, type, ir_binop_max); } +static void +generate_mix_vec(exec_list *instructions, + ir_variable **declarations, + const glsl_type *type) +{ + ir_dereference *const x = new ir_dereference(declarations[0]); + ir_dereference *const y = new ir_dereference(declarations[1]); + ir_dereference *const a = new ir_dereference(declarations[2]); + ir_rvalue *result, *temp; + + temp = new ir_expression(ir_binop_sub, type, new ir_constant(1.0f), a); + result = new ir_expression(ir_binop_mul, type, x, temp); + + temp = new ir_expression(ir_binop_mul, type, y, a); + result = new ir_expression(ir_binop_add, type, result, temp); + + ir_instruction *inst = new ir_return(result); + instructions->push_tail(inst); +} + static void generate_normalize(exec_list *instructions, @@ -235,7 +255,8 @@ generate_function_instance(ir_function *f, sig->definition = label; static const char *arg_names[] = { "arg0", - "arg1" + "arg1", + "arg2" }; int i; @@ -592,7 +613,7 @@ generate_110_functions(glsl_symbol_table *symtab, exec_list *instructions) /* FINISHME: max(x, float y) */ /* FINISHME: clamp() */ /* FINISHME: clamp() */ - /* FINISHME: mix() */ + make_gentype_function(symtab, instructions, "mix", 3, generate_mix_vec); /* FINISHME: mix() */ /* FINISHME: step() */ /* FINISHME: step() */ -- 2.30.2