Clip triangles against softpipe->cliprect which includes scissor and surface bounds.

This prevents rendering out of bounds when the viewport is partially outside the surface bounds.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/mesa/pipe/softpipe/sp_state_derived.c b/src/mesa/pipe/softpipe/sp_state_derived.c
index 9572890afe..e1faaed93c 100644
--- a/src/mesa/pipe/softpipe/sp_state_derived.c
+++ b/src/mesa/pipe/softpipe/sp_state_derived.c
@@ -185,15 +185,15 @@ compute_cliprect(struct softpipe_context *sp)
       /* clip to scissor rect */
       sp->cliprect.minx = MAX2(sp->scissor.minx, 0);
       sp->cliprect.miny = MAX2(sp->scissor.miny, 0);
-      sp->cliprect.maxx = MIN2(sp->scissor.maxx, surfWidth - 1);
-      sp->cliprect.maxy = MIN2(sp->scissor.maxy, surfHeight - 1);
+      sp->cliprect.maxx = MIN2(sp->scissor.maxx, surfWidth);
+      sp->cliprect.maxy = MIN2(sp->scissor.maxy, surfHeight);
    }
    else {
       /* clip to surface bounds */
       sp->cliprect.minx = 0;
       sp->cliprect.miny = 0;
-      sp->cliprect.maxx = surfWidth - 1;
-      sp->cliprect.maxy = surfHeight - 1;
+      sp->cliprect.maxx = surfWidth;
+      sp->cliprect.maxy = surfHeight;
    }
 }