Mesa (master): nvc0: values for undefined outputs must have file GPR

[Christoph Bumiller]

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

Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date:   Sun Feb 20 15:10:02 2011 +0100

nvc0: values for undefined outputs must have file GPR

---

 src/gallium/drivers/nvc0/nvc0_tgsi_to_nc.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/nvc0/nvc0_tgsi_to_nc.c b/src/gallium/drivers/nvc0/nvc0_tgsi_to_nc.c
index 18ae0e0..5e208e8 100644
--- a/src/gallium/drivers/nvc0/nvc0_tgsi_to_nc.c
+++ b/src/gallium/drivers/nvc0/nvc0_tgsi_to_nc.c
@@ -133,13 +133,10 @@ struct bld_context {
 static INLINE ubyte
 bld_register_file(struct bld_context *bld, struct bld_register *reg)
 {
-   if (reg < &bld->avs[0][0]) return NV_FILE_GPR;
-   else
-   if (reg < &bld->pvs[0][0]) return NV_FILE_GPR;
-   else
-   if (reg < &bld->ovs[0][0]) return NV_FILE_PRED;
-   else
-      return NV_FILE_MEM_V;
+   if (reg >= &bld->pvs[0][0] &&
+       reg <  &bld->ovs[0][0])
+      return NV_FILE_PRED;
+   return NV_FILE_GPR;
 }
 
 static INLINE struct nv_value *