From d798214c7b25b0bf2ce6b094475913a1f72585b8 Mon Sep 17 00:00:00 2001 From: Qiang Yu Date: Sat, 14 Jan 2023 22:06:32 +0800 Subject: [PATCH] ac/nir/ngg: fix clip dist culling mask uninitialized MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: f75452918b2 ("ac/nir/ngg: support clipdist culling") Reviewed-by: Timur Kristóf Reviewed-by: Marek Olšák Signed-off-by: Qiang Yu Part-of: --- src/amd/common/ac_nir_lower_ngg.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/amd/common/ac_nir_lower_ngg.c b/src/amd/common/ac_nir_lower_ngg.c index 1b72d550c5c..583e580a1d5 100644 --- a/src/amd/common/ac_nir_lower_ngg.c +++ b/src/amd/common/ac_nir_lower_ngg.c @@ -1391,12 +1391,17 @@ add_deferred_attribute_culling(nir_builder *b, nir_cf_list *original_extracted_c nir_local_variable_create(impl, glsl_uint_type(), "repacked_arg_3"), }; + b->cursor = nir_before_cf_list(&impl->body); + if (nogs_state->options->clipdist_enable_mask || nogs_state->options->user_clip_plane_enable_mask) { nogs_state->clip_vertex_var = nir_local_variable_create(impl, glsl_vec4_type(), "clip_vertex"); nogs_state->clipdist_neg_mask_var = nir_local_variable_create(impl, glsl_uint8_t_type(), "clipdist_neg_mask"); + + /* init mask to 0 */ + nir_store_var(b, nogs_state->clipdist_neg_mask_var, nir_imm_intN_t(b, 0, 8), 1); } /* Top part of the culling shader (aka. position shader part) @@ -1406,8 +1411,6 @@ add_deferred_attribute_culling(nir_builder *b, nir_cf_list *original_extracted_c * The position output is stored into a temporary variable, and reloaded later. */ - b->cursor = nir_before_cf_list(&impl->body); - nir_ssa_def *es_thread = has_input_vertex(b); nir_if *if_es_thread = nir_push_if(b, es_thread); {