aboutsummaryrefslogtreecommitdiffstats
path: root/src/amd/compiler
diff options
context:
space:
mode:
authorTimur Kristóf <[email protected]>2020-04-23 15:53:09 +0200
committerMarge Bot <[email protected]>2020-04-24 17:58:57 +0000
commit62ff2ff8086fd3bbff02004628e0c7498fe3294e (patch)
treec6258a18538479b38ae79320fdc5bfb0dd450de0 /src/amd/compiler
parent277f37d036159d373ec9726fe00148d5e49da875 (diff)
aco: Move s_setprio to correct place after the gs_alloc_req.
Previously the setprio was inside the branch, so it would only reset the priority on the first wave, but not the others. Signed-off-by: Timur Kristóf <[email protected]> Reviewed-by: Rhys Perry <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4536>
Diffstat (limited to 'src/amd/compiler')
-rw-r--r--src/amd/compiler/aco_instruction_selection.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp
index bca192d7564..c83cf00f01a 100644
--- a/src/amd/compiler/aco_instruction_selection.cpp
+++ b/src/amd/compiler/aco_instruction_selection.cpp
@@ -10472,10 +10472,11 @@ void ngg_emit_sendmsg_gs_alloc_req(isel_context *ctx)
/* Request the SPI to allocate space for the primitives and vertices that will be exported by the threadgroup. */
bld.sopp(aco_opcode::s_sendmsg, bld.m0(tmp), -1, sendmsg_gs_alloc_req);
+ end_uniform_if(ctx, &ic);
+
/* After the GS_ALLOC_REQ is done, reset priority to default (0). */
+ bld.reset(ctx->block);
bld.sopp(aco_opcode::s_setprio, -1u, 0x0u);
-
- end_uniform_if(ctx, &ic);
}
Temp ngg_get_prim_exp_arg(isel_context *ctx, unsigned num_vertices, const Temp vtxindex[])