[Mesa-stable] [Mesa-dev] [PATCH 1/3] nir/spirv: Swap the argument order for AtomicCompareExchange

[Dave Airlie]

For the series:

Reviewed-by: Dave Airlie <airlied at redhat.com>

On 7 September 2016 at 08:17, Jason Ekstrand <jason at jlekstrand.net> wrote:
> 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>
> ---
>  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 */
>
> --
> 2.5.0.400.gff86faf
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev