fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-21 10:50:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

aco: Use Navi 10 empty NGG output workaround on NGG culling shaders.

Browse source 
Navi 10 can hang when an NGG workgroup has no output,
so we work around that by always exporting a single zero-area
triangle with a single vertex that has all-NaN coordinates.

Thus far, we only employed this for NGG GS, because on all
other stages, the output can't be empty.

However, with NGG culling, the output can be empty, so let's
apply the same workaround there too.

Cc: mesa-stable
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12169>
(cherry picked from commit 448592b9ae)
This commit is contained in:
Timur Kristóf 2021-08-02 16:48:41 +02:00 • committed by Dylan Baker
parent 217ed59b5d
commit 84dde64fd3
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -31,7 +31,7 @@
"description": "aco: Use Navi 10 empty NGG output workaround on NGG culling shaders.",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

12
src/amd/compiler/aco_instruction_selection.cpp
View file

@ -11553,8 +11553,11 @@ ngg_emit_sendmsg_gs_alloc_req(isel_context* ctx, Temp vtx_cnt, Temp prm_cnt)
Builder bld(ctx->program, ctx->block);
Temp prm_cnt_0;
if (ctx->program->chip_class == GFX10 && ctx->stage.has(SWStage::GS)) {
/* Navi 1x workaround: make sure to always export at least 1 vertex and triangle */
if (ctx->program->chip_class == GFX10 &&
(ctx->stage.has(SWStage::GS) || ctx->program->info->has_ngg_culling)) {
/* Navi 1x workaround: check whether the workgroup has no output.
* If so, change the number of exported vertices and primitives to 1.
*/
prm_cnt_0 = bld.sopc(aco_opcode::s_cmp_eq_u32, bld.def(s1, scc), prm_cnt, Operand::zero());
prm_cnt = bld.sop2(aco_opcode::s_cselect_b32, bld.def(s1), Operand::c32(1u), prm_cnt,
bld.scc(prm_cnt_0));
@ -11568,11 +11571,12 @@ ngg_emit_sendmsg_gs_alloc_req(isel_context* ctx, Temp vtx_cnt, Temp prm_cnt)
tmp = bld.sop2(aco_opcode::s_or_b32, bld.m0(bld.def(s1)), bld.def(s1, scc), tmp, vtx_cnt);
/* Request the SPI to allocate space for the primitives and vertices
* that will be exported by the threadgroup. */
* that will be exported by the threadgroup.
*/
bld.sopp(aco_opcode::s_sendmsg, bld.m0(tmp), -1, sendmsg_gs_alloc_req);
if (prm_cnt_0.id()) {
/* Navi 1x workaround: export a triangle with NaN coordinates when GS has no output.
/* Navi 1x workaround: export a triangle with NaN coordinates when NGG has no output.
* It can't have all-zero positions because that would render an undesired pixel with
* conservative rasterization.
*/