From: Christoph Bumiller <e0425955@student.tuwien.ac.at>
Date: Thu, 9 Sep 2010 17:09:38 +0000 (+0200)
Subject: nv50: fix can_load check for 3rd source
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6997da9f3cf22b9d11ffdfa6ad25b68ef4913fc3;p=mesa.git

nv50: fix can_load check for 3rd source
---

diff --git a/src/gallium/drivers/nv50/nv50_pc.c b/src/gallium/drivers/nv50/nv50_pc.c
index 637b3cf2fe3..e4df742a800 100644
--- a/src/gallium/drivers/nv50/nv50_pc.c
+++ b/src/gallium/drivers/nv50/nv50_pc.c
@@ -112,13 +112,11 @@ nv50_nvi_can_load(struct nv_instruction *nvi, int s, struct nv_value *value)
       if (s == 0 && (value->reg.file == NV_FILE_MEM_S ||
                      value->reg.file == NV_FILE_MEM_P))
          return TRUE;
-      if (s == 1 &&
-          value->reg.file >= NV_FILE_MEM_C(0) &&
-          value->reg.file <= NV_FILE_MEM_C(15))
-         return TRUE;
-      if (s == 2 && nvi->src[1]->value->reg.file == NV_FILE_GPR)
-         return TRUE;
-      return FALSE;
+      if (value->reg.file < NV_FILE_MEM_C(0) ||
+          value->reg.file > NV_FILE_MEM_C(15))
+         return FALSE;
+      return (s == 1) ||
+         ((s == 2) && (nvi->src[1]->value->reg.file == NV_FILE_GPR));
    case NV_OP_MOV:
       assert(s == 0);
       return /* TRUE */ FALSE; /* don't turn MOVs into loads */