diff options
author | marha <marha@users.sourceforge.net> | 2014-09-02 18:57:19 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-09-02 18:57:19 +0200 |
commit | 166caebfaa2b217332a345ffb02c5b9e52f65a3d (patch) | |
tree | 2de6bdc3d44a72fda18c5d070d3902d57a0e5d4a /mesalib/src/glsl/ir.cpp | |
parent | dea8f13d8104872dec9243abe06f3d9e4c807ccd (diff) | |
parent | 4aef26e36bc9aba4cd67c158e17f5fb93c9e018c (diff) | |
download | vcxsrv-166caebfaa2b217332a345ffb02c5b9e52f65a3d.tar.gz vcxsrv-166caebfaa2b217332a345ffb02c5b9e52f65a3d.tar.bz2 vcxsrv-166caebfaa2b217332a345ffb02c5b9e52f65a3d.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/glsl/ir.cpp')
-rwxr-xr-x | 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 c2bfda938..4229a2bf4 100755 --- a/mesalib/src/glsl/ir.cpp +++ b/mesalib/src/glsl/ir.cpp @@ -255,6 +255,7 @@ ir_expression::ir_expression(int op, ir_rvalue *op0) case ir_unop_dFdy_fine: case ir_unop_bitfield_reverse: case ir_unop_interpolate_at_centroid: + case ir_unop_saturate: this->type = op0->type; break; @@ -534,6 +535,7 @@ static const char *const operator_strs[] = { "bit_count", "find_msb", "find_lsb", + "sat", "noise", "interpolate_at_centroid", "+", |