turnip: set .MERGEDREGS based on variant

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

diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c
index e556596c854c518a9097a466090c210365b5835f..418023eb4bf1a350484f4a58569e44a463982eea 100644 (file)
--- 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) |