summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlyssa Rosenzweig <alyssa.rosenzweig@collabora.com>2020-05-28 14:01:29 -0400
committerMarge Bot <eric+marge@anholt.net>2020-05-29 20:34:55 +0000
commit3aacfaf87eccee657ab9a5acc7bfe83b226f120b (patch)
tree6eb22354bf0ef5e7322798e5bd055a785ddd9d20
parente945d4f79d6f4da1d6ad61ebcef43ba47aeb7833 (diff)
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>
-rw-r--r--src/panfrost/bifrost/bi_pack.c2
1 files changed, 1 insertions, 1 deletions
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,