summaryrefslogtreecommitdiffstats
path: root/src/mesa/program/prog_to_nir.c
diff options
context:
space:
mode:
authorJason Ekstrand <jason@jlekstrand.net>2019-05-06 10:23:26 -0500
committerJason Ekstrand <jason@jlekstrand.net>2019-05-24 08:38:11 -0500
commitddd08e1888cfdf7a643b8fa1ce61f77bb66aa3eb (patch)
treed7a679f59482db5f44756bbb482f55e61861d057 /src/mesa/program/prog_to_nir.c
parent6c2ca2a5d33cdfc4202ebb0df54567b587ecc578 (diff)
nir/builder: Remove the use_fmov parameter from nir_swizzle
This flag has caused more confusion than good in most cases. You can validly use imov for floats or fmov for integers because, without source modifiers, neither modify their input in any way. Using imov for floats is more reliable so we go that direction. Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com> Acked-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Diffstat (limited to 'src/mesa/program/prog_to_nir.c')
-rw-r--r--src/mesa/program/prog_to_nir.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/program/prog_to_nir.c b/src/mesa/program/prog_to_nir.c
index 52a1253230c..36e9b689b6b 100644
--- a/src/mesa/program/prog_to_nir.c
+++ b/src/mesa/program/prog_to_nir.c
@@ -412,11 +412,11 @@ ptn_xpd(nir_builder *b, nir_alu_dest dest, nir_ssa_def **src)
ptn_move_dest_masked(b, dest,
nir_fsub(b,
nir_fmul(b,
- nir_swizzle(b, src[0], SWIZ(Y, Z, X, W), 3, true),
- nir_swizzle(b, src[1], SWIZ(Z, X, Y, W), 3, true)),
+ nir_swizzle(b, src[0], SWIZ(Y, Z, X, W), 3),
+ nir_swizzle(b, src[1], SWIZ(Z, X, Y, W), 3)),
nir_fmul(b,
- nir_swizzle(b, src[1], SWIZ(Y, Z, X, W), 3, true),
- nir_swizzle(b, src[0], SWIZ(Z, X, Y, W), 3, true))),
+ nir_swizzle(b, src[1], SWIZ(Y, Z, X, W), 3),
+ nir_swizzle(b, src[0], SWIZ(Z, X, Y, W), 3))),
WRITEMASK_XYZ);
ptn_move_dest_masked(b, dest, nir_imm_float(b, 1.0), WRITEMASK_W);
}
@@ -580,7 +580,7 @@ ptn_tex(struct ptn_compile *c, nir_alu_dest dest, nir_ssa_def **src,
instr->src[src_number].src =
nir_src_for_ssa(nir_swizzle(b, src[0], SWIZ(X, Y, Z, W),
- instr->coord_components, true));
+ instr->coord_components));
instr->src[src_number].src_type = nir_tex_src_coord;
src_number++;