Mesa (master): nir/spirv: Swap the argument order for AtomicCompareExchange

[Jason Ekstrand]

Module: Mesa
Branch: master
Commit: 0ead7bef6b24add7bf0119f8d5f63e4ff806ec72
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0ead7bef6b24add7bf0119f8d5f63e4ff806ec72

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Tue Sep  6 15:02:31 2016 -0700

nir/spirv: Swap the argument order for AtomicCompareExchange

SPIR-V has the two arguments in the opposite order from GLSL.  NIR uses the
GLSL order so we had them backwards.

Fixes dEQP-VK.spirv_assembly.instruction.compute.opatomic.compex

Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
Cc: "12.0" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Dave Airlie <airlied at redhat.com>

---

 src/compiler/spirv/spirv_to_nir.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index fda38f9..4c0c794 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -1847,8 +1847,8 @@ fill_common_atomic_sources(struct vtn_builder *b, SpvOp opcode,
       break;
 
    case SpvOpAtomicCompareExchange:
-      src[0] = nir_src_for_ssa(vtn_ssa_value(b, w[7])->def);
-      src[1] = nir_src_for_ssa(vtn_ssa_value(b, w[8])->def);
+      src[0] = nir_src_for_ssa(vtn_ssa_value(b, w[8])->def);
+      src[1] = nir_src_for_ssa(vtn_ssa_value(b, w[7])->def);
       break;
       /* Fall through */