Mesa (master): freedreno/a6xx: Fix set_blit_scissor helper

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 3264eb691a9e7c79fffcaab0a52dc3d915db34f2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3264eb691a9e7c79fffcaab0a52dc3d915db34f2

Author: Kristian H. Kristensen <hoegsberg at chromium.org>
Date:   Wed Oct 17 14:18:56 2018 -0700

freedreno/a6xx: Fix set_blit_scissor helper

The scissor maxx/maxy are non-inclusive, so don't subtract one from
framebuffer width and height.

Signed-off-by: Kristian H. Kristensen <hoegsberg at chromium.org>

---

 src/gallium/drivers/freedreno/a6xx/fd6_gmem.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c
index 7eb23edae6..94991dfcfc 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c
@@ -591,8 +591,8 @@ set_blit_scissor(struct fd_batch *batch)
 
 	blit_scissor.minx = batch->max_scissor.minx;
 	blit_scissor.miny = batch->max_scissor.miny;
-	blit_scissor.maxx = MIN2(pfb->width - 1, batch->max_scissor.maxx);
-	blit_scissor.maxy = MIN2(pfb->height - 1, batch->max_scissor.maxy);
+	blit_scissor.maxx = MIN2(pfb->width, batch->max_scissor.maxx);
+	blit_scissor.maxy = MIN2(pfb->height, batch->max_scissor.maxy);
 
 	OUT_PKT4(ring, REG_A6XX_RB_BLIT_SCISSOR_TL, 2);
 	OUT_RING(ring,