diff options
| author | Nicolai Hähnle <[email protected]> | 2017-07-14 13:31:49 +0200 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-07-31 10:20:12 +0100 |
| commit | b36ff2d1f207656114701f83af513e382dc0e870 (patch) | |
| tree | ec20cabe45e8e4e2c4ff816db32b31b32130ed98 | |
| parent | 99b2613ce15c4391949ec221694b054c0910e68a (diff) | |
radeonsi/gfx9: fix vertex idx in ES with multiple waves per threadgroup
Cc: [email protected]
Reviewed: Marek Olšák <[email protected]>
(cherry picked from commit 873789002f5d1c7c6c39231a8c8d541f4f61e65c)
| -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 a5baf71b0d0..a153cb77843 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -2879,7 +2879,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), ""); } |