Mesa (master): pan/midgard: Record TEXTURE_OP_BARRIER

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 556964d92701a2d854f5a0636ff15ec0e0cf2fd7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=556964d92701a2d854f5a0636ff15ec0e0cf2fd7

Author: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Date:   Thu Jan 23 20:54:14 2020 -0500

pan/midgard: Record TEXTURE_OP_BARRIER

It's 0x0B for whatever reason.

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

---

 src/panfrost/midgard/disassemble.c | 1 +
 src/panfrost/midgard/midgard.h     | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/panfrost/midgard/disassemble.c b/src/panfrost/midgard/disassemble.c
index 080877dbfe1..bfa42b17278 100644
--- a/src/panfrost/midgard/disassemble.c
+++ b/src/panfrost/midgard/disassemble.c
@@ -1251,6 +1251,7 @@ print_texture_op(FILE *fp, unsigned op, bool gather)
                 DEFINE_CASE(TEXTURE_OP_NORMAL, "texture");
                 DEFINE_CASE(TEXTURE_OP_LOD, "textureLod");
                 DEFINE_CASE(TEXTURE_OP_TEXEL_FETCH, "texelFetch");
+                DEFINE_CASE(TEXTURE_OP_BARRIER, "barrier");
                 DEFINE_CASE(TEXTURE_OP_DFDX, "dFdx");
                 DEFINE_CASE(TEXTURE_OP_DFDY, "dFdy");
 
diff --git a/src/panfrost/midgard/midgard.h b/src/panfrost/midgard/midgard.h
index efb188f5b7e..e2ca42a0e1c 100644
--- a/src/panfrost/midgard/midgard.h
+++ b/src/panfrost/midgard/midgard.h
@@ -612,6 +612,9 @@ midgard_tex_register_select;
 #define TEXTURE_OP_LOD 0x12             /* textureLod */
 #define TEXTURE_OP_TEXEL_FETCH 0x14     /* texelFetch */
 
+/* Implements barrier() */
+#define TEXTURE_OP_BARRIER 0x0B
+
 /* Computes horizontal and vertical derivatives respectively. Use with a float
  * sampler and a "2D" texture.  Leave texture/sampler IDs as zero; they ought
  * to be ignored. Only works for fp32 on 64-bit at a time, so derivatives of a