[Mesa-dev] [PATCH] radeonsi: fix regression in indirect input swizzles.

[Marek Olšák]

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

Marek

On Thu, Aug 30, 2018 at 8:13 PM, Dave Airlie <airlied at gmail.com> wrote:
> From: Dave Airlie <airlied at redhat.com>
>
> This fixes:
> tests/spec/arb_enhanced_layouts/execution/component-layout/vs-fs-array-dvec3.shader_test
> since I reworked the 64-bit swizzles.
>
> Fixes: bb17ae49ee2 (gallivm: allow to pass two swizzles into fetches.)
> ---
>  src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c b/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c
> index d48eda1b100..3ec919dd23b 100644
> --- a/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c
> +++ b/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c
> @@ -317,18 +317,21 @@ static LLVMValueRef
>  emit_array_fetch(struct lp_build_tgsi_context *bld_base,
>                  unsigned File, enum tgsi_opcode_type type,
>                  struct tgsi_declaration_range range,
> -                unsigned swizzle)
> +                unsigned swizzle_in)
>  {
>         struct si_shader_context *ctx = si_shader_context(bld_base);
>         unsigned i, size = range.Last - range.First + 1;
>         LLVMTypeRef vec = LLVMVectorType(tgsi2llvmtype(bld_base, type), size);
>         LLVMValueRef result = LLVMGetUndef(vec);
> -
> +       unsigned swizzle = swizzle_in;
>         struct tgsi_full_src_register tmp_reg = {};
>         tmp_reg.Register.File = File;
> +       if (tgsi_type_is_64bit(type))
> +               swizzle |= (swizzle_in + 1) << 16;
>
>         for (i = 0; i < size; ++i) {
>                 tmp_reg.Register.Index = i + range.First;
> +
>                 LLVMValueRef temp = si_llvm_emit_fetch(bld_base, &tmp_reg, type, swizzle);
>                 result = LLVMBuildInsertElement(ctx->ac.builder, result, temp,
>                         LLVMConstInt(ctx->i32, i, 0), "array_vector");
> --
> 2.17.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev