From 80efe661d737f90a072ea99da188a6d7e4e4df21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 5 Oct 2021 17:16:10 -0400 Subject: [PATCH] radeonsi: simplify write_psize code in si_get_vs_out_cntl Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/radeonsi/si_state_shaders.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index 3d7dad429ef..921bd544641 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -1119,14 +1119,11 @@ static unsigned si_get_vs_out_cntl(const struct si_shader_selector *sel, /* Clip distances can be killed, but cull distances can't. */ unsigned clipcull_mask = (sel->clipdist_mask & ~shader->key.opt.kill_clip_distances) | sel->culldist_mask; - bool writes_psize = sel->info.writes_psize; - - if (shader) - writes_psize &= !shader->key.opt.kill_pointsize; - + bool writes_psize = sel->info.writes_psize && !shader->key.opt.kill_pointsize; bool misc_vec_ena = writes_psize || (sel->info.writes_edgeflag && !ngg) || sel->screen->options.vrs2x2 || sel->info.writes_layer || sel->info.writes_viewport_index; + return S_02881C_VS_OUT_CCDIST0_VEC_ENA((clipcull_mask & 0x0F) != 0) | S_02881C_VS_OUT_CCDIST1_VEC_ENA((clipcull_mask & 0xF0) != 0) | S_02881C_USE_VTX_POINT_SIZE(writes_psize) |