pan/bi: Set branch_conditional if b2b is set
authorAlyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Thu, 28 May 2020 18:01:29 +0000 (14:01 -0400)
committerMarge Bot <eric+marge@anholt.net>
Fri, 29 May 2020 20:34:55 +0000 (20:34 +0000)
Match the blob.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5260>

src/panfrost/bifrost/bi_pack.c

index 4d5aa9f7bfdae658d5aebe80bb2a7b17f56e1a97..e852ae7f4a5bade02bb8f36305c011d176e05ef2 100644 (file)
@@ -41,7 +41,7 @@ bi_pack_header(bi_clause *clause, bi_clause *next, bool is_fragment)
                 .back_to_back = clause->back_to_back,
                 .no_end_of_shader = (next != NULL),
                 .elide_writes = is_fragment,
-                .branch_cond = clause->branch_conditional,
+                .branch_cond = clause->branch_conditional || clause->back_to_back,
                 .datareg_writebarrier = clause->data_register_write_barrier,
                 .datareg = clause->data_register,
                 .scoreboard_deps = next ? next->dependencies : 0,