Mesa (master): Fix test

[Alan Hourihane]

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

Author: Alan Hourihane <alanh at vmware.com>
Date:   Mon Jan  4 12:41:33 2010 +0000

Fix test

---

 src/gallium/auxiliary/tgsi/tgsi_scan.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.c b/src/gallium/auxiliary/tgsi/tgsi_scan.c
index 0f48b0d..a6cc773 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_scan.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_scan.c
@@ -229,8 +229,8 @@ tgsi_is_passthrough_shader(const struct tgsi_token *tokens)
 
             /* Do a whole bunch of checks for a simple move */
             if (fullinst->Instruction.Opcode != TGSI_OPCODE_MOV ||
-                src->Register.File != TGSI_FILE_INPUT ||
-                src->Register.File != TGSI_FILE_SYSTEM_VALUE ||
+                (src->Register.File != TGSI_FILE_INPUT &&
+                 src->Register.File != TGSI_FILE_SYSTEM_VALUE) ||
                 dst->Register.File != TGSI_FILE_OUTPUT ||
                 src->Register.Index != dst->Register.Index ||