projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e04a818)
Fix test
authorAlan Hourihane <alanh@vmware.com>
Mon, 4 Jan 2010 12:41:33 +0000 (12:41 +0000)
committerAlan Hourihane <alanh@vmware.com>
Mon, 4 Jan 2010 12:41:33 +0000 (12:41 +0000)
src/gallium/auxiliary/tgsi/tgsi_scan.c patch | blob | history

diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.c b/src/gallium/auxiliary/tgsi/tgsi_scan.c
index 0f48b0dc3a113ff53ad3e5121bd5f5d91f0dd81b..a6cc773003ace80c6b7d904f89ef7cb3381c5e76 100644 (file)
--- 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 ||