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

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: b0238191ca268e6299fcc3665234df0a6307d903
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b0238191ca268e6299fcc3665234df0a6307d903

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Wed Jun 17 12:07:13 2020 +0100

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

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

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8056>

---

 src/compiler/spirv/vtn_alu.c     | 6 +++---
 src/compiler/spirv/vtn_glsl450.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/compiler/spirv/vtn_alu.c b/src/compiler/spirv/vtn_alu.c
index 19c1af9854b..4298292d05f 100644
--- a/src/compiler/spirv/vtn_alu.c
+++ b/src/compiler/spirv/vtn_alu.c
@@ -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);
          }
       }
    }
diff --git a/src/compiler/spirv/vtn_glsl450.c b/src/compiler/spirv/vtn_glsl450.c
index bba9542daf7..f253b68fef0 100644
--- a/src/compiler/spirv/vtn_glsl450.c
+++ b/src/compiler/spirv/vtn_glsl450.c
@@ -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;