diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-30 15:40:11 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-30 15:40:11 +0200 |
| commit | 22bc825e9931f718cc0564aa55915961abaffce4 (patch) | |
| tree | f53ea31eb5368d3f60860d3e8911fa83a7fd851a /mesalib/src/glsl/ir_constant_expression.cpp | |
| parent | ac46cfda36d6dbe8d5c092124a66ffe3f2bad15f (diff) | |
| parent | 5ebbc3a366287b631775ed3e17537580d380db8a (diff) | |
| download | vcxsrv-22bc825e9931f718cc0564aa55915961abaffce4.tar.gz vcxsrv-22bc825e9931f718cc0564aa55915961abaffce4.tar.bz2 vcxsrv-22bc825e9931f718cc0564aa55915961abaffce4.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver xkeyboard-config xkbcomp git update 30 aug 2013
Diffstat (limited to 'mesalib/src/glsl/ir_constant_expression.cpp')
| -rw-r--r-- | mesalib/src/glsl/ir_constant_expression.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mesalib/src/glsl/ir_constant_expression.cpp b/mesalib/src/glsl/ir_constant_expression.cpp index 0a725b45b..bf019b955 100644 --- a/mesalib/src/glsl/ir_constant_expression.cpp +++ b/mesalib/src/glsl/ir_constant_expression.cpp @@ -1375,6 +1375,17 @@ ir_expression::constant_expression_value(struct hash_table *variable_context) break; } + case ir_triop_fma: + assert(op[0]->type->base_type == GLSL_TYPE_FLOAT); + assert(op[1]->type->base_type == GLSL_TYPE_FLOAT); + assert(op[2]->type->base_type == GLSL_TYPE_FLOAT); + + for (unsigned c = 0; c < components; c++) { + data.f[c] = op[0]->value.f[c] * op[1]->value.f[c] + + op[2]->value.f[c]; + } + break; + case ir_triop_lrp: { assert(op[0]->type->base_type == GLSL_TYPE_FLOAT); assert(op[1]->type->base_type == GLSL_TYPE_FLOAT); |