diff options
| author | Marek Olšák <[email protected]> | 2017-04-19 03:31:12 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-04-28 21:47:35 +0200 |
| commit | fc781fa0ab67d2e7311918d6d4b86588b9940232 (patch) | |
| tree | 39392ce52812f378eebf0996050a2dc5217918b0 | |
| parent | bcaf905129b18fc11613bc3f3f02de18c52bbce1 (diff) | |
radeonsi/gfx9: get GS wave ID from the correct input
Reviewed-by: Nicolai Hähnle <[email protected]>
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 883d42c2e1f..73b5d881bc4 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -2839,12 +2839,20 @@ static void si_llvm_emit_es_epilogue(struct lp_build_tgsi_context *bld_base) } } +static LLVMValueRef si_get_gs_wave_id(struct si_shader_context *ctx) +{ + if (ctx->screen->b.chip_class >= GFX9) + return unpack_param(ctx, ctx->param_merged_wave_info, 16, 8); + else + return LLVMGetParam(ctx->main_fn, ctx->param_gs_wave_id); +} + static void si_llvm_emit_gs_epilogue(struct lp_build_tgsi_context *bld_base) { struct si_shader_context *ctx = si_shader_context(bld_base); ac_build_sendmsg(&ctx->ac, AC_SENDMSG_GS_OP_NOP | AC_SENDMSG_GS_DONE, - LLVMGetParam(ctx->main_fn, ctx->param_gs_wave_id)); + si_get_gs_wave_id(ctx)); } static void si_llvm_emit_vs_epilogue(struct lp_build_tgsi_context *bld_base) @@ -5538,7 +5546,7 @@ static void si_llvm_emit_vertex( /* Signal vertex emission */ ac_build_sendmsg(&ctx->ac, AC_SENDMSG_GS_OP_EMIT | AC_SENDMSG_GS | (stream << 8), - LLVMGetParam(ctx->main_fn, ctx->param_gs_wave_id)); + si_get_gs_wave_id(ctx)); if (!use_kill) lp_build_endif(&if_state); } @@ -5555,7 +5563,7 @@ static void si_llvm_emit_primitive( /* Signal primitive cut */ stream = si_llvm_get_stream(bld_base, emit_data); ac_build_sendmsg(&ctx->ac, AC_SENDMSG_GS_OP_CUT | AC_SENDMSG_GS | (stream << 8), - LLVMGetParam(ctx->main_fn, ctx->param_gs_wave_id)); + si_get_gs_wave_id(ctx)); } static void si_llvm_emit_barrier(const struct lp_build_tgsi_action *action, |