From bfbcd966f32304054d1e9e156cf33984637abe72 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Fri, 1 Jul 2022 13:50:58 -0500 Subject: [PATCH] nir: Use util_mask_sign_extend when serializing constants Reviewed-by: Boris Brezillon Part-of: --- src/compiler/nir/nir_serialize.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/nir/nir_serialize.c b/src/compiler/nir/nir_serialize.c index 90e2b15690f..8866d4bdb94 100644 --- a/src/compiler/nir/nir_serialize.c +++ b/src/compiler/nir/nir_serialize.c @@ -1319,7 +1319,7 @@ write_load_const(write_ctx *ctx, const nir_load_const_instr *lc) /* packed_value contains high 19 bits, low bits are 0 */ header.load_const.packing = load_const_scalar_hi_19bits; header.load_const.packed_value = lc->value[0].u64 >> 45; - } else if (util_sign_extend(lc->value[0].i64 & BITFIELD64_MASK(19), 19) == lc->value[0].i64) { + } else if (util_mask_sign_extend(lc->value[0].i64, 19) == lc->value[0].i64) { /* packed_value contains low 19 bits, high bits are sign-extended */ header.load_const.packing = load_const_scalar_lo_19bits_sext; header.load_const.packed_value = lc->value[0].u64; @@ -1330,7 +1330,7 @@ write_load_const(write_ctx *ctx, const nir_load_const_instr *lc) if ((lc->value[0].u32 & 0x1fff) == 0) { header.load_const.packing = load_const_scalar_hi_19bits; header.load_const.packed_value = lc->value[0].u32 >> 13; - } else if (util_sign_extend(lc->value[0].i32 & BITFIELD_MASK(19), 19) == lc->value[0].i32) { + } else if (util_mask_sign_extend(lc->value[0].i32, 19) == lc->value[0].i32) { header.load_const.packing = load_const_scalar_lo_19bits_sext; header.load_const.packed_value = lc->value[0].u32; }