From: Alan Hourihane <alanh@vmware.com>
Date: Mon, 4 Jan 2010 12:41:33 +0000 (+0000)
Subject: Fix test
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4a531fb46a6ab544666c5eeb362f3622bd44aaff;p=mesa.git

Fix test
---

diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.c b/src/gallium/auxiliary/tgsi/tgsi_scan.c
index 0f48b0dc3a1..a6cc773003a 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 ||