diff options
| author | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2017-07-14 13:31:49 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2017-07-14 13:31:49 +0200 |
| commit | fdd0b367f6d502b3e93ad88bf8be9230638aff9b (patch) | |
| tree | 8cdd6a61478f79ae696470439094e8365d501de9 | |
| parent | 14ed4f8e68d849ae977d98d169bf12de8da0d4f7 (diff) | |
radeonsi/gfx9: fix vertex idx in ES with multiple waves per threadgroup
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index b6dad60a64..116fcb00a8 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -2997,7 +2997,12 @@ static void si_llvm_emit_es_epilogue(struct lp_build_tgsi_context *bld_base) if (ctx->screen->b.chip_class >= GFX9 && info->num_outputs) { unsigned itemsize_dw = es->selector->esgs_itemsize / 4; - lds_base = LLVMBuildMul(gallivm->builder, ac_get_thread_id(&ctx->ac), + LLVMValueRef vertex_idx = ac_get_thread_id(&ctx->ac); + LLVMValueRef wave_idx = unpack_param(ctx, ctx->param_merged_wave_info, 24, 4); + vertex_idx = LLVMBuildOr(gallivm->builder, vertex_idx, + LLVMBuildMul(gallivm->builder, wave_idx, + LLVMConstInt(ctx->i32, 64, false), ""), ""); + lds_base = LLVMBuildMul(gallivm->builder, vertex_idx, LLVMConstInt(ctx->i32, itemsize_dw, 0), ""); } |