From: Erik Faye-Lund Date: Thu, 15 Jun 2023 14:26:12 +0000 (+0200) Subject: v3dv: use imm-helpers X-Git-Tag: upstream/23.3.3~6354 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=80212172e44307141f3b06c858c919658ae69bdd;p=platform%2Fupstream%2Fmesa.git v3dv: use imm-helpers Reviewed-by: Juan A. Suarez Reviewed-by: Kenneth Graunke Part-of: --- diff --git a/src/broadcom/vulkan/v3dv_pipeline.c b/src/broadcom/vulkan/v3dv_pipeline.c index 0f8d38c..99fe8c1 100644 --- a/src/broadcom/vulkan/v3dv_pipeline.c +++ b/src/broadcom/vulkan/v3dv_pipeline.c @@ -629,8 +629,8 @@ lower_tex_src(nir_builder *b, } index = nir_iadd(b, index, - nir_imul(b, nir_imm_int(b, array_elements), - nir_ssa_for_src(b, deref->arr.index, 1))); + nir_imul_imm(b, nir_ssa_for_src(b, deref->arr.index, 1), + array_elements)); } array_elements *= glsl_get_length(parent->type); @@ -767,8 +767,8 @@ lower_image_deref(nir_builder *b, } index = nir_iadd(b, index, - nir_imul(b, nir_imm_int(b, array_elements), - nir_ssa_for_src(b, deref->arr.index, 1))); + nir_imul_imm(b, nir_ssa_for_src(b, deref->arr.index, 1), + array_elements)); } array_elements *= glsl_get_length(parent->type); diff --git a/src/broadcom/vulkan/v3dv_query.c b/src/broadcom/vulkan/v3dv_query.c index 216dd15..3284c46 100644 --- a/src/broadcom/vulkan/v3dv_query.c +++ b/src/broadcom/vulkan/v3dv_query.c @@ -1410,8 +1410,8 @@ nir_get_occlusion_counter_offset(nir_builder *b, nir_ssa_def *query_idx) nir_ssa_def *query_group = nir_udiv_imm(b, query_idx, 16); nir_ssa_def *query_group_offset = nir_umod_imm(b, query_idx, 16); nir_ssa_def *offset = - nir_iadd(b, nir_imul(b, query_group, nir_imm_int(b, 1024)), - nir_imul(b, query_group_offset, nir_imm_int(b, 4))); + nir_iadd(b, nir_imul_imm(b, query_group, 1024), + nir_imul_imm(b, query_group_offset, 4)); return offset; } @@ -1486,10 +1486,10 @@ write_query_buffer(nir_builder *b, */ nir_ssa_def *value64 = nir_vec2(b, value, nir_imm_int(b, 0)); nir_store_ssbo(b, value64, buf, *offset, .write_mask = 0x3, .align_mul = 8); - *offset = nir_iadd(b, *offset, nir_imm_int(b, 8)); + *offset = nir_iadd_imm(b, *offset, 8); } else { nir_store_ssbo(b, value, buf, *offset, .write_mask = 0x1, .align_mul = 4); - *offset = nir_iadd(b, *offset, nir_imm_int(b, 4)); + *offset = nir_iadd_imm(b, *offset, 4); } }