diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-18 08:30:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-18 08:30:48 +0200 |
| commit | c264407352572f07e31695637d3d78d07ae0bae8 (patch) | |
| tree | cf44f0d28a474db43950161c02bba835285ba383 /mesalib/src/glsl/ir.cpp | |
| parent | 369603df0452765724d3b53cd77a9f4bf3809fa1 (diff) | |
| parent | a3691edaff553b5130c97ff912ecaa96f08a6643 (diff) | |
| download | vcxsrv-c264407352572f07e31695637d3d78d07ae0bae8.tar.gz vcxsrv-c264407352572f07e31695637d3d78d07ae0bae8.tar.bz2 vcxsrv-c264407352572f07e31695637d3d78d07ae0bae8.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/glsl/ir.cpp')
| -rw-r--r-- | mesalib/src/glsl/ir.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/glsl/ir.cpp b/mesalib/src/glsl/ir.cpp index f81bfd1ab..1c9eec6e2 100644 --- a/mesalib/src/glsl/ir.cpp +++ b/mesalib/src/glsl/ir.cpp @@ -299,6 +299,7 @@ ir_expression::ir_expression(int op, ir_rvalue *op0) break; case ir_unop_i2u: + case ir_unop_f2u: case ir_unop_bitcast_f2u: this->type = glsl_type::get_instance(GLSL_TYPE_UINT, op0->type->vector_elements, 1); @@ -428,6 +429,7 @@ static const char *const operator_strs[] = { "exp2", "log2", "f2i", + "f2u", "i2f", "f2b", "b2f", |