mesa: Branch 'master'

[Keith Whitwell]

 src/mesa/drivers/dri/i915tex/i915_state.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 4a7fe4fcfa9069043db3ba8e88a6b941788f5f43 (from 32d196820f5669a03bfd1adde1352b857ffda3b6)
Author: Keith Whitwell <keith at tungstengraphics.com>
Date:   Thu Mar 15 10:27:47 2007 +0000

    Fix off by one error in immediate state packet size.

diff --git a/src/mesa/drivers/dri/i915tex/i915_state.c b/src/mesa/drivers/dri/i915tex/i915_state.c
index 78ae4bd..1fafadc 100644
--- a/src/mesa/drivers/dri/i915tex/i915_state.c
+++ b/src/mesa/drivers/dri/i915tex/i915_state.c
@@ -859,7 +859,7 @@ i915_init_packets(struct i915_context *i
       i915->state.Ctx[I915_CTXREG_LI] = (_3DSTATE_LOAD_STATE_IMMEDIATE_1 |
                                          I1_LOAD_S(2) |
                                          I1_LOAD_S(4) |
-                                         I1_LOAD_S(5) | I1_LOAD_S(6) | (4));
+                                         I1_LOAD_S(5) | I1_LOAD_S(6) | (3));
       i915->state.Ctx[I915_CTXREG_LIS2] = 0;
       i915->state.Ctx[I915_CTXREG_LIS4] = 0;
       i915->state.Ctx[I915_CTXREG_LIS5] = 0;