From ee02893573204e7c30039a2dba9b1696dae79d04 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Fri, 16 Jun 2023 15:54:36 +0200 Subject: [PATCH] mesa/st: use imm-helpers Reviewed-by: Alyssa Rosenzweig Reviewed-by: Kenneth Graunke Part-of: --- src/mesa/state_tracker/st_pbo_compute.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mesa/state_tracker/st_pbo_compute.c b/src/mesa/state_tracker/st_pbo_compute.c index e7925d3945f..32971663e0f 100644 --- a/src/mesa/state_tracker/st_pbo_compute.c +++ b/src/mesa/state_tracker/st_pbo_compute.c @@ -366,8 +366,8 @@ get_buffer_offset(nir_builder *b, nir_ssa_def *coord, struct pbo_shader_data *sd bytes_per_row = nir_bcsel(b, nir_ult_imm(b, sd->alignment, 2), bytes_per_row, nir_iand(b, - nir_isub(b, nir_iadd(b, bytes_per_row, sd->alignment), nir_imm_int(b, 1)), - nir_inot(b, nir_isub(b, sd->alignment, nir_imm_int(b, 1))))); + nir_iadd_imm(b, nir_iadd(b, bytes_per_row, sd->alignment), -1), + nir_inot(b, nir_iadd_imm(b, sd->alignment, -1)))); nir_ssa_def *bytes_per_image = nir_imul(b, bytes_per_row, nir_channel(b, sd->range, 1)); bytes_per_row = nir_bcsel(b, sd->invert, nir_ineg(b, bytes_per_row), @@ -407,7 +407,7 @@ swap2(nir_builder *b, nir_ssa_def *src) /* dst[i] = (src[i] >> 8) | ((src[i] << 8) & 0xff00); */ return nir_ior(b, nir_ushr_imm(b, src, 8), - nir_iand_imm(b, nir_ishl(b, src, nir_imm_int(b, 8)), 0xff00)); + nir_iand_imm(b, nir_ishl_imm(b, src, 8), 0xff00)); } static nir_ssa_def * @@ -419,12 +419,12 @@ swap4(nir_builder *b, nir_ssa_def *src) nir_ushr_imm(b, src, 24), nir_ior(b, /* ((b >> 8) & 0xff00) */ - nir_iand(b, nir_ushr_imm(b, src, 8), nir_imm_int(b, 0xff00)), + nir_iand_imm(b, nir_ushr_imm(b, src, 8), 0xff00), nir_ior(b, /* ((b << 8) & 0xff0000) */ - nir_iand(b, nir_ishl(b, src, nir_imm_int(b, 8)), nir_imm_int(b, 0xff0000)), + nir_iand_imm(b, nir_ishl_imm(b, src, 8), 0xff0000), /* ((b << 24) & 0xff000000) */ - nir_iand(b, nir_ishl(b, src, nir_imm_int(b, 24)), nir_imm_int(b, 0xff000000))))); + nir_iand_imm(b, nir_ishl_imm(b, src, 24), 0xff000000)))); } /* explode the cf to handle channel counts in the shader */ @@ -608,7 +608,7 @@ do_shader_conversion(nir_builder *b, nir_ssa_def *pixel, nir_push_if(b, sd->clamp_uint); //uint -> sint CONVERT_SWAP_WRITE(nir_umin(b, pixel, signed_bit_mask)); nir_push_else(b, NULL); - CONVERT_SWAP_WRITE(nir_imin_imax(b, pixel, signed_bit_mask, nir_isub(b, nir_ineg(b, signed_bit_mask), nir_imm_int(b, 1)))); + CONVERT_SWAP_WRITE(nir_imin_imax(b, pixel, signed_bit_mask, nir_iadd_imm(b, nir_ineg(b, signed_bit_mask), -1))); nir_pop_if(b, NULL); nir_push_else(b, NULL); nir_push_if(b, sd->clamp_uint); //uint