nil: Use nvidia headers for ZS format enums

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>

diff --git a/src/nouveau/nil/nil_format.c b/src/nouveau/nil/nil_format.c
index 3b1d605..3cb2a6c 100644 (file)
--- a/src/nouveau/nil/nil_format.c
+++ b/src/nouveau/nil/nil_format.c
@@ -4,10 +4,6 @@
 #include "cl9097tex.h"
 #include "clb097tex.h"
 
-#include "gallium/drivers/nouveau/nv50/g80_defs.xml.h"
-#include "gallium/drivers/nouveau/nv50/g80_texture.xml.h"
-#include "gallium/drivers/nouveau/nvc0/gm107_texture.xml.h"
-
 struct nil_format_info {
    uint32_t rt;
    struct nil_tic_format tic;
@@ -53,16 +49,16 @@ struct nil_format_info {
    SF(c, p, NV9097_SET_COLOR_TARGET_FORMAT_V_##n, r, g, b, a, t, t, t, t, s, u)
 
 #define ZX(c, p, n, r, g, b, a, t, s, u)                                \
-   SF(c, p, G80_ZETA_FORMAT_##n,                                        \
+   SF(c, p, NV9097_SET_ZT_FORMAT_V_##n,                                 \
       r, g, b, ONE_FLOAT, t, UINT, UINT, UINT, s, u)
 #define ZS(c, p, n, r, g, b, a, t, s, u)                                \
-   SF(c, p, G80_ZETA_FORMAT_##n,                                        \
+   SF(c, p, NV9097_SET_ZT_FORMAT_V_##n,                                 \
       r, g, b, ONE_FLOAT, t, UINT, UINT, UINT, s, u)
 #define SZ(c, p, n, r, g, b, a, t, s, u)                                \
-   SF(c, p, G80_ZETA_FORMAT_##n,                                        \
+   SF(c, p, NV9097_SET_ZT_FORMAT_V_##n,                                 \
       r, g, b, ONE_FLOAT, UINT, t, UINT, UINT, s, u)
 #define SX(c, p, r, s, u)                                               \
-   SF(c, p, G80_ZETA_FORMAT_NONE,                                       \
+   SF(c, p, 0,                                                          \
       r, r, r, r, UINT, UINT, UINT, UINT, s, u)
 
 #define F3(c, p, n, r, g, b, a, t, s, u)         \
@@ -94,18 +90,18 @@ static const struct nil_format_info nil_format_infos[PIPE_FORMAT_COUNT] =
    C4(A, R8G8B8A8_SRGB,    A8BL8GL8RL8,   R, G, B, A, UNORM, A8B8G8R8, TB),
    F3(A, R8G8B8X8_SRGB,    X8BL8GL8RL8,   R, G, B, x, UNORM, A8B8G8R8, TB),
 
-   ZX(B, Z16_UNORM, Z16_UNORM, R, R, R, xx, UNORM, Z16, TZ),
-   ZX(A, Z32_FLOAT, Z32_FLOAT, R, R, R, xx, FLOAT, ZF32, TZ),
-   ZX(A, Z24X8_UNORM, Z24_X8_UNORM, R, R, R, xx, UNORM, X8Z24, TZ),
-   SZ(A, X8Z24_UNORM, S8_Z24_UNORM, G, G, G, xx, UNORM, Z24S8, TZ),
-   ZS(A, Z24_UNORM_S8_UINT, Z24_S8_UNORM, R, R, R, xx, UNORM, S8Z24, TZ),
-   SZ(A, S8_UINT_Z24_UNORM, S8_Z24_UNORM, G, G, G, xx, UNORM, Z24S8, TZ),
-   ZS(A, Z32_FLOAT_S8X24_UINT, Z32_S8_X24_FLOAT, R, R, R, xx, FLOAT, ZF32_X24S8, TZ),
-
-   SX(A, S8_UINT, R, R8, T),
-   SX(A, X24S8_UINT, G, G8R24, T),
-   SX(A, S8X24_UINT, R, G24R8, T),
-   SX(A, X32_S8X24_UINT, G, R32_B24G8, T),
+   ZX(B, Z16_UNORM,              Z16,        R, R, R, x, UNORM,   Z16,        TZ),
+   ZX(A, Z32_FLOAT,              ZF32,       R, R, R, x, FLOAT,   ZF32,       TZ),
+   ZX(A, Z24X8_UNORM,            X8Z24,      R, R, R, x, UNORM,   X8Z24,      TZ),
+   SZ(A, X8Z24_UNORM,            Z24S8,      G, G, G, x, UNORM,   Z24S8,      TZ),
+   ZS(A, Z24_UNORM_S8_UINT,      S8Z24,      R, R, R, x, UNORM,   S8Z24,      TZ),
+   SZ(A, S8_UINT_Z24_UNORM,      Z24S8,      G, G, G, x, UNORM,   Z24S8,      TZ),
+   ZS(A, Z32_FLOAT_S8X24_UINT,   ZF32_X24S8, R, R, R, x, FLOAT,   ZF32_X24S8, TZ),
+
+   SX(A, S8_UINT,          R, R8,         T),
+   SX(A, X24S8_UINT,       G, G8R24,      T),
+   SX(A, S8X24_UINT,       R, G24R8,      T),
+   SX(A, X32_S8X24_UINT,   G, R32_B24G8,  T),
 
    F3(A, B5G6R5_UNORM,     R5G6B5,     B, G, R, x, UNORM,   B5G6R5,     TD),
    C4(A, B5G5R5A1_UNORM,   A1R5G5B5,   B, G, R, A, UNORM,   A1B5G5R5,   TD),