From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Thu, 13 Aug 2020 21:15:11 +0000 (-0400)
Subject: pan/mdg: Ensure barrier op is set on texture
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=06c31031e7e87d83747e3f531f8fd5264c03dc08;p=mesa.git

pan/mdg: Ensure barrier op is set on texture

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Fixes: 92c808cd475 ("pan/mdg: eliminate references to ins->texture.op")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6321>
---

diff --git a/src/panfrost/midgard/midgard_emit.c b/src/panfrost/midgard/midgard_emit.c
index 8c08818214c..8b022554a94 100644
--- a/src/panfrost/midgard/midgard_emit.c
+++ b/src/panfrost/midgard/midgard_emit.c
@@ -903,6 +903,7 @@ emit_binary_bundle(compiler_context *ctx,
                 /* Nothing else to pack for barriers */
                 if (ins->op == TEXTURE_OP_BARRIER) {
                         ins->texture.cont = ins->texture.last = 1;
+                        ins->texture.op = ins->op;
                         util_dynarray_append(emission, midgard_texture_word, ins->texture);
                         return;
                 }