From dab745f3b4daf87902a42abd4a531ad90d7039ef Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Tue, 19 Apr 2022 11:58:56 +0100 Subject: [PATCH] nir/copy_prop_vars: fix non-vector shader call payloads Fixes RADV+Q2RTX. Signed-off-by: Rhys Perry Reviewed-by: Jason Ekstrand Fixes: ff05137c2db ("nir: introduce and use nir_component_mask") Part-of: --- src/compiler/nir/nir_opt_copy_prop_vars.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/compiler/nir/nir_opt_copy_prop_vars.c b/src/compiler/nir/nir_opt_copy_prop_vars.c index 9f0a67278ee..68dfc79bd06 100644 --- a/src/compiler/nir/nir_opt_copy_prop_vars.c +++ b/src/compiler/nir/nir_opt_copy_prop_vars.c @@ -191,8 +191,7 @@ gather_vars_written(struct copy_prop_var_state *state, nir_deref_instr *payload = nir_src_as_deref(*nir_get_shader_call_payload_src(intrin)); - nir_component_mask_t mask = - nir_component_mask(glsl_get_vector_elements(payload->type)); + nir_component_mask_t mask = (1 << glsl_get_vector_elements(payload->type)) - 1; struct hash_entry *ht_entry = _mesa_hash_table_search(written->derefs, payload); @@ -1150,8 +1149,7 @@ copy_prop_vars_block(struct copy_prop_var_state *state, nir_deref_and_path payload = { nir_src_as_deref(*nir_get_shader_call_payload_src(intrin)), NULL}; - nir_component_mask_t full_mask = - nir_component_mask(glsl_get_vector_elements(payload.instr->type)); + nir_component_mask_t full_mask = (1 << glsl_get_vector_elements(payload.instr->type)) - 1; kill_aliases(state, copies, &payload, full_mask); break; }