mesa: Branch 'master'

[Patrice Mandin]

 src/mesa/drivers/dri/nouveau/nv10_state.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

New commits:
diff-tree 7520478eb055350702d09e533db02258187d8c74 (from 4c7d36b688866129a17c3f59aa9374b2f9a874de)
Author: Patrice Mandin <patrice at manoir.racoon.city>
Date:   Mon Jan 15 18:58:24 2007 +0100

    nouveau:nv10: fix setting clip region

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index dbd8bf3..0e912e7 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -618,8 +618,10 @@ static void nv10WindowMoved(nouveauConte
         OUT_RING_CACHE(((h+y) << 16) | y | 0x800);
 	for (i=1; i<7; i++) {
 		BEGIN_RING_CACHE(NvSub3D,
-		      NV10_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_HORIZ(i), 2);
+		      NV10_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_HORIZ(i), 1);
         	OUT_RING_CACHE(0);
+		BEGIN_RING_CACHE(NvSub3D,
+		      NV10_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_VERT(i), 1);
 	        OUT_RING_CACHE(0);
 	}