fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 08:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add support for builtin gentype mix(gentype a, gentype b)

Browse source 
Fixes glsl-fs-mix.frag, glsl-fs-mix-constant.frag.
This commit is contained in:
Eric Anholt 2010-04-08 15:10:37 -07:00
parent feeb43b829
commit cc49cea9ea
1 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
builtin_function.cpp
View file

@ -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() */