aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/ir_constant_expression.cpp
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-06-18 08:30:48 +0200
committermarha <marha@users.sourceforge.net>2012-06-18 08:30:48 +0200
commitc264407352572f07e31695637d3d78d07ae0bae8 (patch)
treecf44f0d28a474db43950161c02bba835285ba383 /mesalib/src/glsl/ir_constant_expression.cpp
parent369603df0452765724d3b53cd77a9f4bf3809fa1 (diff)
parenta3691edaff553b5130c97ff912ecaa96f08a6643 (diff)
downloadvcxsrv-c264407352572f07e31695637d3d78d07ae0bae8.tar.gz
vcxsrv-c264407352572f07e31695637d3d78d07ae0bae8.tar.bz2
vcxsrv-c264407352572f07e31695637d3d78d07ae0bae8.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/glsl/ir_constant_expression.cpp')
-rw-r--r--mesalib/src/glsl/ir_constant_expression.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/mesalib/src/glsl/ir_constant_expression.cpp b/mesalib/src/glsl/ir_constant_expression.cpp
index 38a1ed96c..17b54b923 100644
--- a/mesalib/src/glsl/ir_constant_expression.cpp
+++ b/mesalib/src/glsl/ir_constant_expression.cpp
@@ -182,6 +182,12 @@ ir_expression::constant_expression_value(struct hash_table *variable_context)
data.i[c] = (int) op[0]->value.f[c];
}
break;
+ case ir_unop_f2u:
+ assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
+ for (unsigned c = 0; c < op[0]->type->components(); c++) {
+ data.i[c] = (unsigned) op[0]->value.f[c];
+ }
+ break;
case ir_unop_i2f:
assert(op[0]->type->base_type == GLSL_TYPE_INT);
for (unsigned c = 0; c < op[0]->type->components(); c++) {