mesa: Branch 'master'

[Alex Deucher]

 src/mesa/drivers/dri/r128/r128_tris.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 25f21b5331d27225b1f6b7aaf2c9bf3f32764d91 (from da82d86ea00fa05d8483e25618a0150bc0ee8a6c)
Author: Miroslav Å ustek <sustmidown at centrum.cz>
Date:   Mon Mar 26 23:34:33 2007 -0400

    fix r128 rendering, lockups
    
    mis-count in offset led to mis-rendering and lockups;
    units are 4 bytes rather than 1.  Noticed by Chris Salch.
    fixes bug 7994, possibly others.

diff --git a/src/mesa/drivers/dri/r128/r128_tris.c b/src/mesa/drivers/dri/r128/r128_tris.c
index 7e3e714..f406e92 100644
--- a/src/mesa/drivers/dri/r128/r128_tris.c
+++ b/src/mesa/drivers/dri/r128/r128_tris.c
@@ -605,9 +605,9 @@ static void r128RenderStart( GLcontext *
     * build up a hardware vertex.
     */
    if (RENDERINPUTS_TEST_RANGE( index_bitset, _TNL_FIRST_TEX, _TNL_LAST_TEX ))
-      EMIT_ATTR( _TNL_ATTRIB_POS, EMIT_4F_VIEWPORT, R128_CCE_VC_FRMT_RHW, 16 );
+      EMIT_ATTR( _TNL_ATTRIB_POS, EMIT_4F_VIEWPORT, R128_CCE_VC_FRMT_RHW, 4 );
    else
-      EMIT_ATTR( _TNL_ATTRIB_POS, EMIT_3F_VIEWPORT, 0, 12 );
+      EMIT_ATTR( _TNL_ATTRIB_POS, EMIT_3F_VIEWPORT, 0, 3 );
 
    rmesa->coloroffset = offset;
 #if MESA_LITTLE_ENDIAN