Mesa (master): nv50: fix always true conditional in shader optimization

[Christoph Bumiller]

Module: Mesa
Branch: master
Commit: 71fd35d1adeb63bc64ee31cae2499f896d72dfb1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=71fd35d1adeb63bc64ee31cae2499f896d72dfb1

Author: Nicolas Kaiser <nikai at nikai.net>
Date:   Tue Oct  5 11:26:43 2010 +0200

nv50: fix always true conditional in shader optimization

---

 src/gallium/drivers/nv50/nv50_pc_optimize.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/nv50/nv50_pc_optimize.c b/src/gallium/drivers/nv50/nv50_pc_optimize.c
index 921ed15..27eb381 100644
--- a/src/gallium/drivers/nv50/nv50_pc_optimize.c
+++ b/src/gallium/drivers/nv50/nv50_pc_optimize.c
@@ -452,7 +452,7 @@ nv_pass_lower_mods(struct nv_pass *ctx, struct nv_basic_block *b)
       if (nvi->opcode == NV_OP_SAT) {
          mi = nvi->src[0]->value->insn;
 
-         if (mi->opcode != NV_OP_ADD || mi->opcode != NV_OP_MAD)
+         if (mi->opcode != NV_OP_ADD && mi->opcode != NV_OP_MAD)
             continue;
          if (mi->flags_def || mi->def[0]->refc > 1)
             continue;