pan/mdg: Ensure barrier op is set on texture
authorAlyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Thu, 13 Aug 2020 21:15:11 +0000 (17:15 -0400)
committerMarge Bot <eric+marge@anholt.net>
Wed, 19 Aug 2020 12:08:51 +0000 (12:08 +0000)
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>

src/panfrost/midgard/midgard_emit.c

index 8c08818214c72e30c26ab19f4fc8653bfb19124b..8b022554a94068c0fc32ee540f8a97aa500df1d0 100644 (file)
@@ -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;
                 }