Mesa (master): i965: use BRW_MAX_GRF, BRW_MAX_MRF

Brian Paul brianp at kemper.freedesktop.org
Tue Jun 30 23:16:20 UTC 2009


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

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jun 30 16:36:11 2009 -0600

i965: use BRW_MAX_GRF, BRW_MAX_MRF

---

 src/mesa/drivers/dri/i965/brw_eu.h |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_eu.h b/src/mesa/drivers/dri/i965/brw_eu.h
index 3ee56fe..b7116d4 100644
--- a/src/mesa/drivers/dri/i965/brw_eu.h
+++ b/src/mesa/drivers/dri/i965/brw_eu.h
@@ -171,9 +171,9 @@ static INLINE struct brw_reg brw_reg( GLuint file,
 {
    struct brw_reg reg;
    if (type == BRW_GENERAL_REGISTER_FILE)
-      assert(nr < 128);
+      assert(nr < BRW_MAX_GRF);
    else if (type == BRW_MESSAGE_REGISTER_FILE)
-      assert(nr < 9);
+      assert(nr < BRW_MAX_MRF);
    else if (type == BRW_ARCHITECTURE_REGISTER_FILE)
       assert(nr <= BRW_ARF_IP);
 
@@ -538,6 +538,7 @@ static INLINE struct brw_reg brw_mask_reg( GLuint subnr )
 
 static INLINE struct brw_reg brw_message_reg( GLuint nr )
 {
+   assert(nr < BRW_MAX_MRF);
    return brw_vec8_reg(BRW_MESSAGE_REGISTER_FILE,
 		       nr,
 		       0);




More information about the mesa-commit mailing list