aboutsummaryrefslogtreecommitdiffstats
path: root/src/freedreno
diff options
context:
space:
mode:
authorRob Clark <[email protected]>2020-06-13 09:35:40 -0700
committerMarge Bot <[email protected]>2020-06-18 02:46:28 +0000
commit0e0d4daa5b10b0060f07b72ff46cf14bd1c888e5 (patch)
treea579c422fb3aeeb3e7350d9f7dd26a3d4bf7be11 /src/freedreno
parentc6632c087d36b65299981a719f00d8a55cd514c3 (diff)
turnip: set .MERGEDREGS based on variant
Signed-off-by: Rob Clark <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5458>
Diffstat (limited to 'src/freedreno')
-rw-r--r--src/freedreno/vulkan/tu_pipeline.c3
1 files changed, 2 insertions, 1 deletions
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) |