diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-30 15:35:17 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-30 15:35:17 +0200 |
| commit | 5ebbc3a366287b631775ed3e17537580d380db8a (patch) | |
| tree | f43c3d54e7c0e161c83288d83b22cbd7da49cc96 /mesalib/src/glsl/ir_constant_expression.cpp | |
| parent | 84e570d071a041f85e2e8b92963d3390d14af5fc (diff) | |
| download | vcxsrv-5ebbc3a366287b631775ed3e17537580d380db8a.tar.gz vcxsrv-5ebbc3a366287b631775ed3e17537580d380db8a.tar.bz2 vcxsrv-5ebbc3a366287b631775ed3e17537580d380db8a.zip | |
fontconfig mesa xserver xkeyboard-config xkbcomp git update 30 aug 2013
xserver commit 94d4e29aedc69431fa9b299ca1b67947173d7a24
xkeyboard-config commit fcb91cb1013cbdd87a6f77533f188d5934f24046
xkbcomp commit 24d18e0a844041ef82441adb16aa18cc4b4814ae
fontconfig commit 071ce44c35733e54cb477cc75810cbe55025b619
mesa commit f7217b99f243738f941a5d009c68387dfadcb50a
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); |