From cdaa8e67e3c79d13feb4207e84018572edb095ca Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Fri, 5 Apr 2024 15:39:31 -0500
Subject: [PATCH] nil: Move nil_tic_format to nil_format_table.h

This gets it out of nil_format.c/h and decouples things a bit.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27397>
---
 src/nouveau/nil/nil_format.c            |  8 --------
 src/nouveau/nil/nil_format.h            | 15 ---------------
 src/nouveau/nil/nil_format_table_gen.py | 14 +++++++++++++-
 src/nouveau/nil/nil_image_tic.c         | 10 +++++++++-
 4 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/nouveau/nil/nil_format.c b/src/nouveau/nil/nil_format.c
index ee31ad38f46..0cb48c5ada6 100644
--- a/src/nouveau/nil/nil_format.c
+++ b/src/nouveau/nil/nil_format.c
@@ -102,11 +102,3 @@ nil_format_to_depth_stencil(enum pipe_format format)
    assert(fmt->support & NIL_FORMAT_SUPPORTS_DEPTH_STENCIL_BIT);
    return fmt->czt;
 }
-
-const struct nil_tic_format *
-nil_tic_format_for_pipe(enum pipe_format format)
-{
-   assert(format < PIPE_FORMAT_COUNT);
-   const struct nil_format_info *fmt = &nil_format_table[format];
-   return fmt->tic.comp_sizes == 0 ? NULL : &fmt->tic;
-}
diff --git a/src/nouveau/nil/nil_format.h b/src/nouveau/nil/nil_format.h
index 96cbaccd756..33d31772e78 100644
--- a/src/nouveau/nil/nil_format.h
+++ b/src/nouveau/nil/nil_format.h
@@ -40,19 +40,4 @@ uint8_t nil_format_to_color_target(enum pipe_format format);
 
 uint8_t nil_format_to_depth_stencil(enum pipe_format format);
 
-struct nil_tic_format {
-   unsigned comp_sizes:8;
-   unsigned type_r:3;
-   unsigned type_g:3;
-   unsigned type_b:3;
-   unsigned type_a:3;
-   unsigned src_x:3;
-   unsigned src_y:3;
-   unsigned src_z:3;
-   unsigned src_w:3;
-};
-
-const struct nil_tic_format *
-nil_tic_format_for_pipe(enum pipe_format format);
-
 #endif /* NIL_FORMAT_H */
diff --git a/src/nouveau/nil/nil_format_table_gen.py b/src/nouveau/nil/nil_format_table_gen.py
index c63a711a230..d42269ad416 100644
--- a/src/nouveau/nil/nil_format_table_gen.py
+++ b/src/nouveau/nil/nil_format_table_gen.py
@@ -17,7 +17,7 @@ TEMPLATE_H = template.Template(text="""\
 #ifndef ${guard}
 #define ${guard}
 
-#include "nil_format.h"
+#include "util/format/u_format.h"
 
 enum nil_format_support_flags {
    NIL_FORMAT_SUPPORTS_TEXTURE_BIT        = BITFIELD_BIT(0),
@@ -29,6 +29,18 @@ enum nil_format_support_flags {
    NIL_FORMAT_SUPPORTS_SCANOUT_BIT        = BITFIELD_BIT(6),
 };
 
+struct nil_tic_format {
+   unsigned comp_sizes:8;
+   unsigned type_r:3;
+   unsigned type_g:3;
+   unsigned type_b:3;
+   unsigned type_a:3;
+   unsigned src_x:3;
+   unsigned src_y:3;
+   unsigned src_z:3;
+   unsigned src_w:3;
+};
+
 struct nil_format_info {
    unsigned czt:8;
    unsigned support:24;
diff --git a/src/nouveau/nil/nil_image_tic.c b/src/nouveau/nil/nil_image_tic.c
index b9bb038153a..282659b7add 100644
--- a/src/nouveau/nil/nil_image_tic.c
+++ b/src/nouveau/nil/nil_image_tic.c
@@ -4,7 +4,7 @@
  */
 #include "nil_image.h"
 
-#include "nil_format.h"
+#include "nil_format_table.h"
 #include "util/bitpack_helpers.h"
 
 #include "nouveau_device.h"
@@ -94,6 +94,14 @@ __set_bool(uint32_t *o, bool b, unsigned lo, unsigned hi)
 #define TH_NVC097_SET_U(o, VER, FIELD, val) \
    TH_SET_U((o), NVC097, _##VER, FIELD, (val));
 
+static const struct nil_tic_format *
+nil_tic_format_for_pipe(enum pipe_format format)
+{
+   assert(format < PIPE_FORMAT_COUNT);
+   const struct nil_format_info *fmt = &nil_format_table[format];
+   return fmt->tic.comp_sizes == 0 ? NULL : &fmt->tic;
+}
+
 static inline uint32_t
 nv9097_th_bl_source(const struct nil_tic_format *fmt,
                     enum pipe_swizzle swz, bool is_int)