Commit d4ecc3c9 authored by Bas Nieuwenhuizen's avatar Bas Nieuwenhuizen Committed by Dave Airlie

ac/nir: Add loading from LDS for merged GS.

Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
parent ec53e527
...@@ -3008,7 +3008,12 @@ load_gs_input(struct nir_to_llvm_context *ctx, ...@@ -3008,7 +3008,12 @@ load_gs_input(struct nir_to_llvm_context *ctx,
param = shader_io_get_unique_index(instr->variables[0]->var->data.location); param = shader_io_get_unique_index(instr->variables[0]->var->data.location);
for (unsigned i = 0; i < instr->num_components; i++) { for (unsigned i = 0; i < instr->num_components; i++) {
if (ctx->ac.chip_class >= GFX9) {
LLVMValueRef dw_addr = ctx->gs_vtx_offset[vtx_offset_param];
dw_addr = LLVMBuildAdd(ctx->ac.builder, dw_addr,
LLVMConstInt(ctx->ac.i32, param * 4 + i, 0), "");
value[i] = lds_load(ctx, dw_addr);
} else {
args[0] = ctx->esgs_ring; args[0] = ctx->esgs_ring;
args[1] = vtx_offset; args[1] = vtx_offset;
args[2] = LLVMConstInt(ctx->i32, (param * 4 + i + const_index) * 256, false); args[2] = LLVMConstInt(ctx->i32, (param * 4 + i + const_index) * 256, false);
...@@ -3024,6 +3029,7 @@ load_gs_input(struct nir_to_llvm_context *ctx, ...@@ -3024,6 +3029,7 @@ load_gs_input(struct nir_to_llvm_context *ctx,
AC_FUNC_ATTR_READONLY | AC_FUNC_ATTR_READONLY |
AC_FUNC_ATTR_LEGACY); AC_FUNC_ATTR_LEGACY);
} }
}
result = ac_build_gather_values(&ctx->ac, value, instr->num_components); result = ac_build_gather_values(&ctx->ac, value, instr->num_components);
return result; return result;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment