nouveau: nv10,20: wrong viewport clip setup

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index cc0f5a7..e0475bb 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -658,8 +658,10 @@ static void nv10WindowMoved(nouveauContextPtr nmesa)
        OUT_RING(0);
 
        BEGIN_RING_CACHE(NvSub3D,
-             NV10_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_HORIZ(0), 2);
+             NV10_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_HORIZ(0), 1);
         OUT_RING_CACHE(((w+x-1) << 16) | x | 0x08000800);
+       BEGIN_RING_CACHE(NvSub3D,
+             NV10_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_VERT(0), 1);
         OUT_RING_CACHE(((h+y-1) << 16) | y | 0x08000800);
        for (i=1; i<8; i++) {
                BEGIN_RING_CACHE(NvSub3D,

diff --git a/src/mesa/drivers/dri/nouveau/nv20_state.c b/src/mesa/drivers/dri/nouveau/nv20_state.c
index 417590d..030713c 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv20_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv20_state.c
@@ -642,8 +642,10 @@ static void nv20WindowMoved(nouveauContextPtr nmesa)
        OUT_RING(0);
 
        BEGIN_RING_CACHE(NvSub3D,
-             NV20_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_HORIZ(0), 2);
+             NV20_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_HORIZ(0), 1);
         OUT_RING_CACHE((4095 << 16) | 0);
+       BEGIN_RING_CACHE(NvSub3D,
+             NV20_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_VERT(0), 1);
         OUT_RING_CACHE((4095 << 16) | 0);
        for (i=1; i<8; i++) {
                BEGIN_RING_CACHE(NvSub3D,