mesa: Branch 'master' - 2 commits

[Haihao Xiang]

 src/mesa/drivers/dri/i965/brw_urb.c |    2 +-
 src/mesa/main/api_loopback.c        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree a1ea7812b2b8869b60877995fdb957e9539309bd (from bb59d81d2d1baaed98e7a2990540a4bb1394222c)
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Sun Mar 25 21:40:58 2007 +0800

    i965: The given urb layout(maximal size of urb entries and the
    values for nr of entries) should meet the requirement.

diff --git a/src/mesa/drivers/dri/i965/brw_urb.c b/src/mesa/drivers/dri/i965/brw_urb.c
index 79ff2b2..64f5904 100644
--- a/src/mesa/drivers/dri/i965/brw_urb.c
+++ b/src/mesa/drivers/dri/i965/brw_urb.c
@@ -131,7 +131,7 @@ static void recalculate_urb_fence( struc
 
 	 brw->urb.constrained = 1;
 	 
-	 if (check_urb_layout(brw)) {
+	 if (!check_urb_layout(brw)) {
 	    /* This is impossible, given the maximal sizes of urb
 	     * entries and the values for minimum nr of entries
 	     * provided above.
diff-tree bb59d81d2d1baaed98e7a2990540a4bb1394222c (from 8a4546b5610aff82a8d61e692ccdf1ca0e06a3e1)
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Sun Mar 25 21:31:36 2007 +0800

    Color3iv: set the alpha value to 1.0

diff --git a/src/mesa/main/api_loopback.c b/src/mesa/main/api_loopback.c
index 717ef1f..efe5a77 100644
--- a/src/mesa/main/api_loopback.c
+++ b/src/mesa/main/api_loopback.c
@@ -146,7 +146,7 @@ static void GLAPIENTRY
 loopback_Color3iv_f( const GLint *v )
 {
    COLORF( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]),
-	   INT_TO_FLOAT(v[2]), INT_TO_FLOAT(v[3]) );
+	   INT_TO_FLOAT(v[2]), 1.0 );
 }
 
 static void GLAPIENTRY