From: Rob Clark Date: Sat, 13 Jun 2020 16:35:40 +0000 (-0700) Subject: turnip: set .MERGEDREGS based on variant X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0e0d4daa5b10b0060f07b72ff46cf14bd1c888e5;p=mesa.git turnip: set .MERGEDREGS based on variant Signed-off-by: Rob Clark Part-of: --- 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) |