fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir/lower_tex: wider usage of nir_tex_instr_src_index(..)

Browse source 
Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Suggested-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8898>
This commit is contained in:
Christian Gmeiner 2021-02-11 13:13:42 +01:00 • committed by Marge Bot
parent a403ff4d70
commit 8cb52f6735
1 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/compiler/nir/nir_lower_tex.c
View file

@ -200,16 +200,13 @@ lower_rect(nir_builder *b, nir_tex_instr *tex)
nir_ssa_def *txs = nir_i2f32(b, nir_get_texture_size(b, tex));
nir_ssa_def *scale = nir_frcp(b, txs);
int coord_index = nir_tex_instr_src_index(tex, nir_tex_src_coord);
/* Walk through the sources normalizing the requested arguments. */
for (unsigned i = 0; i < tex->num_srcs; i++) {
if (tex->src[i].src_type != nir_tex_src_coord)
continue;
if (coord_index != -1) {
nir_ssa_def *coords =
nir_ssa_for_src(b, tex->src[i].src, tex->coord_components);
nir_ssa_for_src(b, tex->src[coord_index].src, tex->coord_components);
nir_instr_rewrite_src(&tex->instr,
&tex->src[i].src,
&tex->src[coord_index].src,
nir_src_for_ssa(nir_fmul(b, coords, scale)));
}
}
@ -221,16 +218,13 @@ lower_rect_tex_scale(nir_builder *b, nir_tex_instr *tex)
nir_ssa_def *idx = nir_imm_int(b, tex->texture_index);
nir_ssa_def *scale = nir_build_load_texture_rect_scaling(b, 32, idx);
int coord_index = nir_tex_instr_src_index(tex, nir_tex_src_coord);
/* Walk through the sources normalizing the requested arguments. */
for (unsigned i = 0; i < tex->num_srcs; i++) {
if (tex->src[i].src_type != nir_tex_src_coord)
continue;
if (coord_index != -1) {
nir_ssa_def *coords =
nir_ssa_for_src(b, tex->src[i].src, tex->coord_components);
nir_ssa_for_src(b, tex->src[coord_index].src, tex->coord_components);
nir_instr_rewrite_src(&tex->instr,
&tex->src[i].src,
&tex->src[coord_index].src,
nir_src_for_ssa(nir_fmul(b, coords, scale)));
}
}
@ -774,14 +768,11 @@ saturate_src(nir_builder *b, nir_tex_instr *tex, unsigned sat_mask)
tex = lower_txb_to_txl(b, tex);
b->cursor = nir_before_instr(&tex->instr);
int coord_index = nir_tex_instr_src_index(tex, nir_tex_src_coord);
/* Walk through the sources saturating the requested arguments. */
for (unsigned i = 0; i < tex->num_srcs; i++) {
if (tex->src[i].src_type != nir_tex_src_coord)
continue;
if (coord_index != -1) {
nir_ssa_def *src =
nir_ssa_for_src(b, tex->src[i].src, tex->coord_components);
nir_ssa_for_src(b, tex->src[coord_index].src, tex->coord_components);
/* split src into components: */
nir_ssa_def *comp[4];
@ -815,7 +806,7 @@ saturate_src(nir_builder *b, nir_tex_instr *tex, unsigned sat_mask)
src = nir_vec(b, comp, tex->coord_components);
nir_instr_rewrite_src(&tex->instr,
&tex->src[i].src,
&tex->src[coord_index].src,
nir_src_for_ssa(src));
}
return tex;