From 3aacfaf87eccee657ab9a5acc7bfe83b226f120b Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Thu, 28 May 2020 14:01:29 -0400
Subject: [PATCH] pan/bi: Set branch_conditional if b2b is set

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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/panfrost/bifrost/bi_pack.c b/src/panfrost/bifrost/bi_pack.c
index 4d5aa9f7bfd..e852ae7f4a5 100644
--- a/src/panfrost/bifrost/bi_pack.c
+++ b/src/panfrost/bifrost/bi_pack.c
@@ -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,
-- 
2.30.2