pan/gen_macros: Map {TEXTURE,SAMPLER} to the arch-specific descriptor

This will ease the transition to per-arch XML files. While at it, patch
pan_cmdstream.c to use this new macro and avoid an #if section.

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

diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c
index d298444..a793ce9 100644 (file)
--- a/src/gallium/drivers/panfrost/pan_cmdstream.c
+++ b/src/gallium/drivers/panfrost/pan_cmdstream.c
@@ -143,11 +143,7 @@ panfrost_create_sampler_state(
 
         bool using_nearest = cso->min_img_filter == PIPE_TEX_MIPFILTER_NEAREST;
 
-#if PAN_ARCH <= 5
-        pan_pack(&so->hw, MIDGARD_SAMPLER, cfg) {
-#else
-        pan_pack(&so->hw, BIFROST_SAMPLER, cfg) {
-#endif
+        pan_pack(&so->hw, SAMPLER, cfg) {
                 cfg.magnify_nearest = cso->mag_img_filter == PIPE_TEX_FILTER_NEAREST;
                 cfg.minify_nearest = cso->min_img_filter == PIPE_TEX_FILTER_NEAREST;
 

diff --git a/src/panfrost/lib/gen_macros.h b/src/panfrost/lib/gen_macros.h
index c059440..1426a9c 100644 (file)
--- a/src/panfrost/lib/gen_macros.h
+++ b/src/panfrost/lib/gen_macros.h
@@ -58,8 +58,12 @@
 
 #if PAN_ARCH >= 6
 #define TILER_JOB BIFROST_TILER_JOB
+#define TEXTURE BIFROST_TEXTURE
+#define SAMPLER BIFROST_SAMPLER
 #else
 #define TILER_JOB MIDGARD_TILER_JOB
+#define TEXTURE MIDGARD_TEXTURE
+#define SAMPLER MIDGARD_SAMPLER
 #endif
 
 /* Suffixing macros */