From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Wed, 13 May 2020 15:05:49 +0000 (-0400)
Subject: pan/mdg: Pack barriers correctly
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3d435b334b4e22a89104728f0c32d8b2864b4903;p=mesa.git

pan/mdg: Pack barriers correctly

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

diff --git a/src/panfrost/midgard/midgard_emit.c b/src/panfrost/midgard/midgard_emit.c
index e9a67811aa8..e4911c1faf4 100644
--- a/src/panfrost/midgard/midgard_emit.c
+++ b/src/panfrost/midgard/midgard_emit.c
@@ -596,6 +596,13 @@ emit_binary_bundle(compiler_context *ctx,
                 ins->texture.type = bundle->tag;
                 ins->texture.next_type = next_tag;
 
+                /* Nothing else to pack for barriers */
+                if (ins->texture.op == TEXTURE_OP_BARRIER) {
+                        ins->texture.cont = ins->texture.last = 1;
+                        util_dynarray_append(emission, midgard_texture_word, ins->texture);
+                        return;
+                }
+
                 signed override = mir_upper_override(ins, 32);
 
                 ins->texture.mask = override > 0 ?