pan/bi: Use lower_index_to_offset

Instead of doing the add ourselves.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21546>
This commit is contained in:
Alyssa Rosenzweig 2023-02-25 23:02:17 -05:00 committed by Marge Bot
parent 282aeb9b9c
commit 510d3ab93d

View file

@ -3509,19 +3509,10 @@ bi_emit_texc(bi_builder *b, nir_tex_instr *instr)
break;
case nir_tex_src_texture_offset:
if (instr->texture_index)
index =
bi_iadd_u32(b, index, bi_imm_u32(instr->texture_index), false);
dregs[BIFROST_TEX_DREG_TEXTURE] = index;
break;
case nir_tex_src_sampler_offset:
if (instr->sampler_index)
index =
bi_iadd_u32(b, index, bi_imm_u32(instr->sampler_index), false);
dregs[BIFROST_TEX_DREG_SAMPLER] = index;
break;
@ -3697,12 +3688,10 @@ bi_emit_tex_valhall(bi_builder *b, nir_tex_instr *instr)
break;
case nir_tex_src_texture_offset:
assert(instr->texture_index == 0);
texture = index;
break;
case nir_tex_src_sampler_offset:
assert(instr->sampler_index == 0);
sampler = index;
break;
@ -4512,6 +4501,7 @@ bi_optimize_nir(nir_shader *nir, unsigned gpu_id, bool is_blend)
.lower_tg4_broadcom_swizzle = true,
.lower_txd = true,
.lower_invalid_implicit_lod = true,
.lower_index_to_offset = true,
};
NIR_PASS(progress, nir, pan_nir_lower_64bit_intrin);