Mesa (master): svga: Tighten the register file assertions.

[Jose Fonseca]

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

Author: José Fonseca <jfonseca at vmware.com>
Date:   Fri Nov  4 20:07:26 2011 +0000

svga: Tighten the register file assertions.

Untested. But should fix fdo 42576.

---

 src/gallium/drivers/svga/svga_tgsi_emit.h |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/svga/svga_tgsi_emit.h b/src/gallium/drivers/svga/svga_tgsi_emit.h
index 943433d..3f458eb 100644
--- a/src/gallium/drivers/svga/svga_tgsi_emit.h
+++ b/src/gallium/drivers/svga/svga_tgsi_emit.h
@@ -264,8 +264,7 @@ dst_register( unsigned file,
 
    /* check values against bitfield sizes */
    assert(number < (1 << 11));
-   assert((file >> 3) < 4);
-   assert((file & 0x7) < 8);
+   assert(file <= SVGA3DREG_PREDICATE);
 
    dest.value = 0;
    dest.num = number;
@@ -298,8 +297,7 @@ src_token( unsigned file, int number )
 
    /* check values against bitfield sizes */
    assert(number < (1 << 11));
-   assert((file >> 3) < 4);
-   assert((file & 0x7) < 8);
+   assert(file <= SVGA3DREG_PREDICATE);
 
    src.value = 0;
    src.num = number;