Mesa (master): aco: Move s_setprio to correct place after the gs_alloc_req.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 62ff2ff8086fd3bbff02004628e0c7498fe3294e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=62ff2ff8086fd3bbff02004628e0c7498fe3294e

Author: Timur Kristóf <timur.kristof at gmail.com>
Date:   Thu Apr 23 15:53:09 2020 +0200

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 <timur.kristof at gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4536>

---

 src/amd/compiler/aco_instruction_selection.cpp | 5 +++--
 1 file 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[])