Mesa (19.0): radeonsi: fix assertion failure by using the correct type

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Apr 11 03:34:48 UTC 2019


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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed Feb 27 18:31:54 2019 -0500

radeonsi: fix assertion failure by using the correct type

src/gallium/drivers/radeonsi/si_state_viewport.c:196: si_emit_guardband:
Assertion `vp_as_scissor.maxx <= max_viewport_size[vp_as_scissor.quant_mode]
&& vp_as_scissor.maxy <= max_viewport_size[vp_as_scissor.quant_mode]' failed.

The comparison was unsigned, so negative maxx or maxy would fail.

Fixes: 3c540e0a7488 "radeonsi: Fix guardband computation for large render targets"
(cherry picked from commit 3ad2a9b3faa19e29fe1c2a28c712f265ee29423b)

---

 src/gallium/drivers/radeonsi/si_state_viewport.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_state_viewport.c b/src/gallium/drivers/radeonsi/si_state_viewport.c
index 64bb956b200..a9a1be73ba4 100644
--- a/src/gallium/drivers/radeonsi/si_state_viewport.c
+++ b/src/gallium/drivers/radeonsi/si_state_viewport.c
@@ -186,7 +186,7 @@ static void si_emit_guardband(struct si_context *ctx)
 		ctx->chip_class >= VI ? 16 : MAX2(ctx->screen->se_tile_repeat, 16);
 
 	/* Indexed by quantization modes */
-	static unsigned max_viewport_size[] = {65535, 16383, 4095};
+	static int max_viewport_size[] = {65535, 16383, 4095};
 
 	/* Ensure that the whole viewport stays representable in
 	 * absolute coordinates.




More information about the mesa-commit mailing list