From: Nicolai Hähnle Date: Fri, 14 Jul 2017 11:31:49 +0000 (+0200) Subject: radeonsi/gfx9: fix vertex idx in ES with multiple waves per threadgroup X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=873789002f5d1c7c6c39231a8c8d541f4f61e65c;p=mesa.git radeonsi/gfx9: fix vertex idx in ES with multiple waves per threadgroup Cc: mesa-stable@lists.freedesktop.org Reviewed: Marek Olšák --- 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), ""); }