Mesa (master): turnip: set .MERGEDREGS based on variant

[GitLab Mirror]

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

Author: Rob Clark <robdclark at chromium.org>
Date:   Sat Jun 13 09:35:40 2020 -0700

turnip: set .MERGEDREGS based on variant

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

---

 src/freedreno/vulkan/tu_pipeline.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c
index e556596c854..418023eb4bf 100644
--- a/src/freedreno/vulkan/tu_pipeline.c
+++ b/src/freedreno/vulkan/tu_pipeline.c
@@ -605,7 +605,8 @@ tu6_emit_xs_config(struct tu_cs *cs,
    tu_cs_emit(cs,
               A6XX_SP_VS_CTRL_REG0_THREADSIZE(threadsize) |
               A6XX_SP_VS_CTRL_REG0_FULLREGFOOTPRINT(xs->info.max_reg + 1) |
-              A6XX_SP_VS_CTRL_REG0_MERGEDREGS |
+              A6XX_SP_VS_CTRL_REG0_HALFREGFOOTPRINT(xs->info.max_half_reg + 1) |
+              COND(xs->mergedregs, A6XX_SP_VS_CTRL_REG0_MERGEDREGS) |
               A6XX_SP_VS_CTRL_REG0_BRANCHSTACK(xs->branchstack) |
               COND(xs->need_pixlod, A6XX_SP_VS_CTRL_REG0_PIXLODENABLE) |
               COND(xs->need_fine_derivatives, A6XX_SP_VS_CTRL_REG0_DIFF_FINE) |