Mesa (master): ac: fix gs load inputs type

[Timothy Arceri]

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

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Mon Jan 22 18:23:27 2018 +1100

ac: fix gs load inputs type

This fixes the scenario where the input is a struct. With this
the Unreal engines Elemental demo now works on radeonsi.

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

---

 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 858f75bc17..e9885a5a26 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -3191,16 +3191,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++) {