From: Rob Clark <robdclark@chromium.org>
Date: Wed, 29 Jul 2020 16:09:19 +0000 (-0700)
Subject: freedreno/a6xx: don't emit a bogus size for empty cb slots
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=82b419fefde427874152e8de2e838178c20cf00a;p=mesa.git

freedreno/a6xx: don't emit a bogus size for empty cb slots

Noticed that asphalt9 had no uniforms bound, so cb[0] is null.  In
theory shouldn't cause a problem, since nothing is doing `ldc` against
cb[0], but to be safe we should use SIZE=0.

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

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_const.c b/src/gallium/drivers/freedreno/a6xx/fd6_const.c
index e2c982d8226..bfe2fec9683 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_const.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_const.c
@@ -273,7 +273,7 @@ fd6_emit_ubos(struct fd_context *ctx, const struct ir3_shader_variant *v,
 					0);
 		} else {
 			OUT_RING(ring, 0xbad00000 | (i << 16));
-			OUT_RING(ring, 0xbad00000 | (i << 16));
+			OUT_RING(ring, A6XX_UBO_1_SIZE(0));
 		}
 	}
 }