Mesa (main): pan/gen_macros: Move the TEXTURE definition to gen_macros.h

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 2092f60ec1b61e2827e0a19a43cbf50249d34f82
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2092f60ec1b61e2827e0a19a43cbf50249d34f82

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Wed Jul 28 11:12:23 2021 +0200

pan/gen_macros: Move the TEXTURE definition to gen_macros.h

So we can use the same trick in panvk.

Signed-off-by: Boris Brezillon <boris.brezillon at collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12551>

---

 src/gallium/drivers/panfrost/pan_cmdstream.c | 6 ------
 src/panfrost/lib/gen_macros.h                | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c
index d951b2709ef..d2984443a1a 100644
--- a/src/gallium/drivers/panfrost/pan_cmdstream.c
+++ b/src/gallium/drivers/panfrost/pan_cmdstream.c
@@ -2624,12 +2624,6 @@ panfrost_batch_get_bifrost_tiler(struct panfrost_batch *batch, unsigned vertex_c
 }
 #endif
 
-#if PAN_ARCH >= 6
-#define TILER_JOB BIFROST_TILER_JOB
-#else
-#define TILER_JOB MIDGARD_TILER_JOB
-#endif
-
 static void
 panfrost_draw_emit_tiler(struct panfrost_batch *batch,
                          const struct pipe_draw_info *info,
diff --git a/src/panfrost/lib/gen_macros.h b/src/panfrost/lib/gen_macros.h
index bea4f358800..c059440510b 100644
--- a/src/panfrost/lib/gen_macros.h
+++ b/src/panfrost/lib/gen_macros.h
@@ -56,6 +56,12 @@
 #  error "The PAN_ARCH macro must be defined"
 #endif
 
+#if PAN_ARCH >= 6
+#define TILER_JOB BIFROST_TILER_JOB
+#else
+#define TILER_JOB MIDGARD_TILER_JOB
+#endif
+
 /* Suffixing macros */
 #if (PAN_ARCH == 4)
 #  define GENX(X) X##_v4