fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

spirv: swap fadd operands in build_asin() and matrix_multiply()

Browse source 
This shouldn't do anything but will make testing a later patch easier.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8056>
This commit is contained in:
Rhys Perry 2020-06-17 12:07:13 +01:00 • committed by Marge Bot
parent 82d0600ba2
commit b0238191ca
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/compiler/spirv/vtn_alu.c
View file

@ -122,9 +122,9 @@ matrix_multiply(struct vtn_builder *b,
nir_channel(&b->nb, src1->elems[i]->def, src0_columns - 1));
for (int j = src0_columns - 2; j >= 0; j--) {
dest->elems[i]->def =
nir_fadd(&b->nb, dest->elems[i]->def,
nir_fmul(&b->nb, src0->elems[j]->def,
nir_channel(&b->nb, src1->elems[i]->def, j)));
nir_fadd(&b->nb, nir_fmul(&b->nb, src0->elems[j]->def,
nir_channel(&b->nb, src1->elems[i]->def, j)),
dest->elems[i]->def);
}
}
}

4
src/compiler/spirv/vtn_glsl450.c
View file

@ -232,8 +232,8 @@ build_asin(nir_builder *b, nir_ssa_def *x, float p0, float p1, bool piecewise)
pS1)),
pS0));
nir_ssa_def *q = nir_fadd(b, one, nir_fmul_imm(b, x2, qS1));
nir_ssa_def *result1 = nir_fadd(b, x, nir_fmul(b, x, nir_fdiv(b, p, q)));
nir_ssa_def *q = nir_fadd(b, nir_fmul_imm(b, x2, qS1), one);
nir_ssa_def *result1 = nir_fadd(b, nir_fmul(b, x, nir_fdiv(b, p, q)), x);
return nir_bcsel(b, nir_flt(b, abs_x, half), result1, result0);
} else {
return result0;