From a3c293cdcdaffc1608719e4ddf71b59f2a8bf3cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 21 Nov 2024 13:21:53 -0500 Subject: [PATCH] radeonsi: revert to always returning true for load_cull_any_enabled_amd Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/radeonsi/si_nir_lower_abi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeonsi/si_nir_lower_abi.c b/src/gallium/drivers/radeonsi/si_nir_lower_abi.c index 7f61e978293..af92a10f220 100644 --- a/src/gallium/drivers/radeonsi/si_nir_lower_abi.c +++ b/src/gallium/drivers/radeonsi/si_nir_lower_abi.c @@ -417,7 +417,9 @@ static bool lower_intrinsic(nir_builder *b, nir_instr *instr, struct lower_abi_s replacement = nir_imm_false(b); break; case nir_intrinsic_load_cull_any_enabled_amd: - replacement = nir_imm_bool(b, si_shader_culling_enabled(shader)); + /* If culling is enabled at compile time, it's always enabled at runtime. */ + assert(si_shader_culling_enabled(shader)); + replacement = nir_imm_true(b); break; case nir_intrinsic_load_cull_back_face_enabled_amd: replacement = nir_i2b(b, GET_FIELD_NIR(GS_STATE_CULL_FACE_BACK));