ac: fix gs load inputs type
authorTimothy Arceri <tarceri@itsqueeze.com>
Mon, 22 Jan 2018 07:23:27 +0000 (18:23 +1100)
committerTimothy Arceri <tarceri@itsqueeze.com>
Mon, 29 Jan 2018 00:14:23 +0000 (11:14 +1100)
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@redhat.com>
src/amd/common/ac_nir_to_llvm.c

index 858f75bc172f1fbe5102443c6dbd9c430f48c562..e9885a5a26d9fbd71f63b3d9ff9289597acaa195 100644 (file)
@@ -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++) {