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_builder.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_builder.cpp')
-rw-r--r-- | mesalib/src/glsl/ir_builder.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mesalib/src/glsl/ir_builder.cpp b/mesalib/src/glsl/ir_builder.cpp index f03941443..a2f6f2967 100644 --- a/mesalib/src/glsl/ir_builder.cpp +++ b/mesalib/src/glsl/ir_builder.cpp @@ -271,11 +271,7 @@ clamp(operand a, operand b, operand c) ir_expression * saturate(operand a) { - void *mem_ctx = ralloc_parent(a.val); - - return expr(ir_binop_max, - expr(ir_binop_min, a, new(mem_ctx) ir_constant(1.0f)), - new(mem_ctx) ir_constant(0.0f)); + return expr(ir_unop_saturate, a); } ir_expression * |