aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-05-10 11:49:54 +0200
committermarha <marha@users.sourceforge.net>2012-05-10 11:49:54 +0200
commit6231dd66fec697922b164ec03731f04542c2b30e (patch)
tree83bfa2dec8ba2d32860d513b7816dae412712fa5 /mesalib/src
parent58780b4306bd1254c6c0e65d255630d5c546005f (diff)
parent13a63d4f69c0692539448cb3d8e4a0e1ffdf2183 (diff)
downloadvcxsrv-6231dd66fec697922b164ec03731f04542c2b30e.tar.gz
vcxsrv-6231dd66fec697922b164ec03731f04542c2b30e.tar.bz2
vcxsrv-6231dd66fec697922b164ec03731f04542c2b30e.zip
Merge remote-tracking branch 'origin/released'
Conflicts: xorg-server/os/log.c
Diffstat (limited to 'mesalib/src')
-rw-r--r--mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 9e68deb34..eecabb3e6 100644
--- a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -1775,9 +1775,7 @@ glsl_to_tgsi_visitor::visit(ir_expression *ir)
emit(ir, TGSI_OPCODE_TRUNC, result_dst, op[0]);
break;
case ir_unop_ceil:
- op[0].negate = ~op[0].negate;
- emit(ir, TGSI_OPCODE_FLR, result_dst, op[0]);
- result_src.negate = ~result_src.negate;
+ emit(ir, TGSI_OPCODE_CEIL, result_dst, op[0]);
break;
case ir_unop_floor:
emit(ir, TGSI_OPCODE_FLR, result_dst, op[0]);