mesa: Branch 'master' - 3 commits

[Keith Whitwell]

 src/mesa/drivers/dri/i915/i915_reg.h    |    2 +-
 src/mesa/drivers/dri/i915/i915_state.c  |    2 +-
 src/mesa/drivers/dri/i915/i915_vtbl.c   |    2 +-
 src/mesa/drivers/dri/i915tex/i915_reg.h |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree 77544d7b7d7c6fd03c0df81dca07f1bb3a67c119 (from c9e39aeaef0135d6d1aa92a3dc5b3c91fa17904d)
Author: Keith Whitwell <keith at tungstengraphics.com>
Date:   Sun Mar 18 20:13:06 2007 +0000

    fix off-by-one in load_state_immediate

diff --git a/src/mesa/drivers/dri/i915/i915_state.c b/src/mesa/drivers/dri/i915/i915_state.c
index fd11e10..5e00e65 100644
--- a/src/mesa/drivers/dri/i915/i915_state.c
+++ b/src/mesa/drivers/dri/i915/i915_state.c
@@ -813,7 +813,7 @@ static void i915_init_packets( i915Conte
 				       I1_LOAD_S(4) |
 				       I1_LOAD_S(5) |
 				       I1_LOAD_S(6) | 
-				       (4));
+				       (3));
       i915->state.Ctx[I915_CTXREG_LIS2] = 0;
       i915->state.Ctx[I915_CTXREG_LIS4] = 0;
       i915->state.Ctx[I915_CTXREG_LIS5] = 0;
diff --git a/src/mesa/drivers/dri/i915/i915_vtbl.c b/src/mesa/drivers/dri/i915/i915_vtbl.c
index 2936a0f..b533e15 100644
--- a/src/mesa/drivers/dri/i915/i915_vtbl.c
+++ b/src/mesa/drivers/dri/i915/i915_vtbl.c
@@ -180,7 +180,7 @@ static void i915_emit_invarient_state( i
     */
    OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | 
 	     I1_LOAD_S(3) |
-	     (1));
+	     (0));
    OUT_BATCH(0);
  
    /* XXX: Use this */
diff-tree c9e39aeaef0135d6d1aa92a3dc5b3c91fa17904d (from 07265280a962253913e974829e6729c64ca18bc2)
Author: Keith Whitwell <keith at tungstengraphics.com>
Date:   Sun Mar 18 20:12:53 2007 +0000

    fix typo in subrect_disable packet

diff --git a/src/mesa/drivers/dri/i915/i915_reg.h b/src/mesa/drivers/dri/i915/i915_reg.h
index 3ba792a..694cd4c 100644
--- a/src/mesa/drivers/dri/i915/i915_reg.h
+++ b/src/mesa/drivers/dri/i915/i915_reg.h
@@ -138,7 +138,7 @@
 
 
 /* 3DSTATE_DEPTH_SUBRECT_DISABLE, p160 */
-#define _3DSTATE_DEPTH_SUBRECT_DISABLE    (CMD_3D | (0x1c<<24) | (0x11<19) | 0x2)
+#define _3DSTATE_DEPTH_SUBRECT_DISABLE    (CMD_3D | (0x1c<<24) | (0x11<<19) | 0x2)
 
 /* p161 */
 #define _3DSTATE_DST_BUF_VARS_CMD	(CMD_3D | (0x1d<<24) | (0x85<<16))
diff-tree 07265280a962253913e974829e6729c64ca18bc2 (from c41d6ab6f062ebce1076ca79f9ad0c7368a0e2d0)
Author: Keith Whitwell <keith at tungstengraphics.com>
Date:   Sun Mar 18 20:12:38 2007 +0000

    fix typo in subrect_disable packet

diff --git a/src/mesa/drivers/dri/i915tex/i915_reg.h b/src/mesa/drivers/dri/i915tex/i915_reg.h
index 04b1999..34c6821 100644
--- a/src/mesa/drivers/dri/i915tex/i915_reg.h
+++ b/src/mesa/drivers/dri/i915tex/i915_reg.h
@@ -138,7 +138,7 @@
 
 
 /* 3DSTATE_DEPTH_SUBRECT_DISABLE, p160 */
-#define _3DSTATE_DEPTH_SUBRECT_DISABLE    (CMD_3D | (0x1c<<24) | (0x11<19) | 0x2)
+#define _3DSTATE_DEPTH_SUBRECT_DISABLE    (CMD_3D | (0x1c<<24) | (0x11<<19) | 0x2)
 
 /* p161 */
 #define _3DSTATE_DST_BUF_VARS_CMD	(CMD_3D | (0x1d<<24) | (0x85<<16))