[Mesa-stable] [Mesa-dev] [PATCH] ac/nir: to integer the args to bcsel.

[Bas Nieuwenhuizen]

Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

On Tue, Feb 20, 2018 at 1:16 AM, Dave Airlie <airlied at gmail.com> wrote:

> From: Dave Airlie <airlied at redhat.com>
>
> dEQP-VK.tessellation.invariance.outer_edge_symmetry.triangles_equal_
> spacing_ccw
> was hitting an llvm assert due to one value being an int and the
> other a float.
>
> This just casts both values to integer and fixes the test.
>
> Fixes: dEQP-VK.tessellation.invariance.outer_edge_
> symmetry.triangles_equal_spacing_ccw
> Cc: mesa-stable at lists.freedesktop.org
> Signed-off-by: Dave Airlie <airlied at redhat.com>
> ---
>  src/amd/common/ac_nir_to_llvm.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_
> llvm.c
> index dc471de..8906418 100644
> --- a/src/amd/common/ac_nir_to_llvm.c
> +++ b/src/amd/common/ac_nir_to_llvm.c
> @@ -1312,7 +1312,8 @@ static LLVMValueRef emit_bcsel(struct
> ac_llvm_context *ctx,
>  {
>         LLVMValueRef v = LLVMBuildICmp(ctx->builder, LLVMIntNE, src0,
>                                        ctx->i32_0, "");
> -       return LLVMBuildSelect(ctx->builder, v, src1, src2, "");
> +       return LLVMBuildSelect(ctx->builder, v, ac_to_integer(ctx, src1),
> +                              ac_to_integer(ctx, src2), "");
>  }
>
>  static LLVMValueRef emit_minmax_int(struct ac_llvm_context *ctx,
> --
> 2.9.5
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-stable/attachments/20180220/fe561a3e/attachment.html>