Mesa (master): freedreno/gmem: make noscis debug actually do something on a6xx

[GitLab Mirror]

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

Author: Rob Clark <robdclark at chromium.org>
Date:   Fri May 22 12:28:38 2020 -0700

freedreno/gmem: make noscis debug actually do something on a6xx

Signed-off-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5188>

---

 src/gallium/drivers/freedreno/freedreno_gmem.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/freedreno/freedreno_gmem.c b/src/gallium/drivers/freedreno/freedreno_gmem.c
index a289662f0de..4c694df1c63 100644
--- a/src/gallium/drivers/freedreno/freedreno_gmem.c
+++ b/src/gallium/drivers/freedreno/freedreno_gmem.c
@@ -463,7 +463,7 @@ gmem_key_init(struct fd_batch *batch, bool assume_zs, bool no_scis_opt)
 	/* NOTE: on a6xx, the max-scissor-rect is handled in fd6_gmem, and
 	 * we just rely on CP_COND_EXEC to skip bins with no geometry.
 	 */
-	if ((fd_mesa_debug & FD_DBG_NOSCIS) || no_scis_opt || is_a6xx(screen)) {
+	if (no_scis_opt || is_a6xx(screen)) {
 		key->minx = 0;
 		key->miny = 0;
 		key->width = pfb->width;
@@ -471,6 +471,13 @@ gmem_key_init(struct fd_batch *batch, bool assume_zs, bool no_scis_opt)
 	} else {
 		struct pipe_scissor_state *scissor = &batch->max_scissor;
 
+		if (fd_mesa_debug & FD_DBG_NOSCIS) {
+			scissor->minx = 0;
+			scissor->miny = 0;
+			scissor->maxx = pfb->width;
+			scissor->maxy = pfb->height;
+		}
+
 		/* round down to multiple of alignment: */
 		key->minx = scissor->minx & ~(screen->gmem_alignw - 1);
 		key->miny = scissor->miny & ~(screen->gmem_alignh - 1);