[Mesa-dev] [PATCH 1/2] ac: fix gs load inputs type

[Marek Olšák]

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

Marek

On Mon, Jan 22, 2018 at 8:31 AM, Timothy Arceri <tarceri at itsqueeze.com> wrote:
> This fixes the scenario where the input is a struct. With this
> the Unreal engines Elemental demo now works on radeonsi.
> ---
>  src/amd/common/ac_nir_to_llvm.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
> index 2c9b85bf82..1b4b877205 100644
> --- a/src/amd/common/ac_nir_to_llvm.c
> +++ b/src/amd/common/ac_nir_to_llvm.c
> @@ -3189,16 +3189,17 @@ static LLVMValueRef visit_load_var(struct ac_nir_context *ctx,
>                 }
>
>                 if (ctx->stage == MESA_SHADER_GEOMETRY) {
> +                               LLVMTypeRef type = LLVMIntTypeInContext(ctx->ac.context, instr->dest.ssa.bit_size);
>                                 LLVMValueRef indir_index;
>                                 unsigned const_index, vertex_index;
>                                 get_deref_offset(ctx, instr->variables[0],
>                                                  false, &vertex_index, NULL,
>                                                  &const_index, &indir_index);
> +
>                         return ctx->abi->load_inputs(ctx->abi, instr->variables[0]->var->data.location,
>                                                      instr->variables[0]->var->data.driver_location,
>                                                      instr->variables[0]->var->data.location_frac, ve,
> -                                                    vertex_index, const_index,
> -                                                    nir2llvmtype(ctx, instr->variables[0]->var->type));
> +                                                    vertex_index, const_index, type);
>                 }
>
>                 for (unsigned chan = comp; chan < ve + comp; chan++) {
> --
> 2.14.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev