From 2092f60ec1b61e2827e0a19a43cbf50249d34f82 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Wed, 28 Jul 2021 11:12:23 +0200 Subject: [PATCH] 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 Reviewed-by: Alyssa Rosenzweig Part-of: --- 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