nv50-: switch nv50_formats.c to updated g80_texture.xml.h

Verified (binary diff) to produce identical code.

Signed-off-by: Ben Skeggs <[email protected]>
Acked-by: Ilia Mirkin <[email protected]>

1 files changed, 207 insertions, 206 deletions

diff --git a/src/gallium/drivers/nouveau/nv50/nv50_formats.c b/src/gallium/drivers/nouveau/nv50/nv50_formats.c
index 9f17ab68ee8..c91d29be4e9 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_formats.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_formats.c
@@ -27,7 +27,7 @@
 # include "nv50/nv50_screen.h"
 # include "nv50/nv50_3d.xml.h"
 #endif
-#include "nv50/nv50_texture.xml.h"
+#include "nv50/g80_texture.xml.h"
 #include "nv50/g80_defs.xml.h"
 
 #include "pipe/p_defines.h"
@@ -62,19 +62,20 @@
 #define G80_ZETA_FORMAT_NONE    0
 #define G80_SURFACE_FORMAT_NONE 0
 
-#define SF_A(sz) NV50_TIC_0_FMT_##sz
-#define SF_C(sz) NVC0_TIC_0_FMT_##sz
+#define SF_A(sz) G80_TIC_0_COMPONENTS_SIZES_##sz
+#define SF_B(sz) G200_TIC_0_COMPONENTS_SIZES_##sz
+#define SF_C(sz) GF100_TIC_0_COMPONENTS_SIZES_##sz
 #define SF(c, pf, sf, r, g, b, a, t0, t1, t2, t3, sz, u)                \
    [PIPE_FORMAT_##pf] = {                                               \
       sf,                                                               \
-      (NV50_TIC_MAP_##r << NV50_TIC_0_MAPR__SHIFT) |                    \
-      (NV50_TIC_MAP_##g << NV50_TIC_0_MAPG__SHIFT) |                    \
-      (NV50_TIC_MAP_##b << NV50_TIC_0_MAPB__SHIFT) |                    \
-      (NV50_TIC_MAP_##a << NV50_TIC_0_MAPA__SHIFT) |                    \
-      (NV50_TIC_TYPE_##t0 << NV50_TIC_0_TYPE0__SHIFT) |                 \
-      (NV50_TIC_TYPE_##t1 << NV50_TIC_0_TYPE1__SHIFT) |                 \
-      (NV50_TIC_TYPE_##t2 << NV50_TIC_0_TYPE2__SHIFT) |                 \
-      (NV50_TIC_TYPE_##t3 << NV50_TIC_0_TYPE3__SHIFT) |                 \
+      (G80_TIC_SOURCE_##r << G80_TIC_0_X_SOURCE__SHIFT) |               \
+      (G80_TIC_SOURCE_##g << G80_TIC_0_Y_SOURCE__SHIFT) |               \
+      (G80_TIC_SOURCE_##b << G80_TIC_0_Z_SOURCE__SHIFT) |               \
+      (G80_TIC_SOURCE_##a << G80_TIC_0_W_SOURCE__SHIFT) |               \
+      (G80_TIC_TYPE_##t0 << G80_TIC_0_R_DATA_TYPE__SHIFT) |             \
+      (G80_TIC_TYPE_##t1 << G80_TIC_0_G_DATA_TYPE__SHIFT) |             \
+      (G80_TIC_TYPE_##t2 << G80_TIC_0_B_DATA_TYPE__SHIFT) |             \
+      (G80_TIC_TYPE_##t3 << G80_TIC_0_A_DATA_TYPE__SHIFT) |             \
       SF_##c(sz), U_##u                                                 \
    }
 
@@ -118,201 +119,201 @@ const struct nvc0_format nvc0_format_table[PIPE_FORMAT_COUNT] =
 const struct nv50_format nv50_format_table[PIPE_FORMAT_COUNT] =
 #endif
 {
-   C4(A, B8G8R8A8_UNORM, BGRA8_UNORM, C2, C1, C0, C3, UNORM, 8_8_8_8, TD),
-   F3(A, B8G8R8X8_UNORM, BGRX8_UNORM, C2, C1, C0, xx, UNORM, 8_8_8_8, TD),
-   C4(A, B8G8R8A8_SRGB, BGRA8_SRGB, C2, C1, C0, C3, UNORM, 8_8_8_8, TD),
-   F3(A, B8G8R8X8_SRGB, BGRX8_SRGB, C2, C1, C0, xx, UNORM, 8_8_8_8, TD),
-   C4(A, R8G8B8A8_UNORM, RGBA8_UNORM, C0, C1, C2, C3, UNORM, 8_8_8_8, IB),
-   F3(A, R8G8B8X8_UNORM, RGBX8_UNORM, C0, C1, C2, xx, UNORM, 8_8_8_8, TB),
-   C4(A, R8G8B8A8_SRGB, RGBA8_SRGB, C0, C1, C2, C3, UNORM, 8_8_8_8, TB),
-   F3(A, R8G8B8X8_SRGB, RGBX8_SRGB, C0, C1, C2, xx, UNORM, 8_8_8_8, TB),
-
-   ZX(A, Z16_UNORM, Z16_UNORM, C0, C0, C0, xx, UNORM, Z16, TZ),
-   ZX(A, Z32_FLOAT, Z32_FLOAT, C0, C0, C0, xx, FLOAT, Z32, TZ),
-   ZX(A, Z24X8_UNORM, Z24_X8_UNORM, C0, C0, C0, xx, UNORM, Z24_X8, TZ),
-   SZ(A, X8Z24_UNORM, S8_Z24_UNORM, C1, C1, C1, xx, UNORM, S8_Z24, TZ),
-   ZS(A, Z24_UNORM_S8_UINT, Z24_S8_UNORM, C0, C0, C0, xx, UNORM, Z24_S8, TZ),
-   SZ(A, S8_UINT_Z24_UNORM, S8_Z24_UNORM, C1, C1, C1, xx, UNORM, S8_Z24, TZ),
-   ZS(A, Z32_FLOAT_S8X24_UINT, Z32_S8_X24_FLOAT, C0, C0, C0, xx, FLOAT, Z32_S8_X24, TZ),
-
-   SX(A, S8_UINT, C0, 8, T),
-   SX(A, X24S8_UINT, C1, Z24_S8, T),
-   SX(A, S8X24_UINT, C0, S8_Z24, T),
-   SX(A, X32_S8X24_UINT, C1, Z32_S8_X24, T),
-
-   F3(A, B5G6R5_UNORM, B5G6R5_UNORM, C2, C1, C0, xx, UNORM, 5_6_5, TD),
-   C4(A, B5G5R5A1_UNORM, BGR5_A1_UNORM, C2, C1, C0, C3, UNORM, 5_5_5_1, TD),
-   F3(A, B5G5R5X1_UNORM, BGR5_X1_UNORM, C2, C1, C0, xx, UNORM, 5_5_5_1, TD),
-   C4(A, B4G4R4A4_UNORM, NONE, C2, C1, C0, C3, UNORM, 4_4_4_4, T),
-   F3(A, B4G4R4X4_UNORM, NONE, C2, C1, C0, xx, UNORM, 4_4_4_4, T),
-   F3(A, R9G9B9E5_FLOAT, NONE, C0, C1, C2, xx, FLOAT, 9_9_9_E5, T),
-
-   C4(A, R10G10B10A2_UNORM, RGB10_A2_UNORM, C0, C1, C2, C3, UNORM, 10_10_10_2, IB),
-   C4(A, B10G10R10A2_UNORM, BGR10_A2_UNORM, C2, C1, C0, C3, UNORM, 10_10_10_2, TD),
-   C4(A, R10G10B10A2_SNORM, NONE, C0, C1, C2, C3, SNORM, 10_10_10_2, T),
-   C4(A, B10G10R10A2_SNORM, NONE, C2, C1, C0, C3, SNORM, 10_10_10_2, T),
-   C4(A, R10G10B10A2_UINT, RGB10_A2_UINT, C0, C1, C2, C3, UINT, 10_10_10_2, TR),
-   C4(A, B10G10R10A2_UINT, RGB10_A2_UINT, C2, C1, C0, C3, UINT, 10_10_10_2, T),
-
-   F3(A, R11G11B10_FLOAT, R11G11B10_FLOAT, C0, C1, C2, xx, FLOAT, 11_11_10, IB),
-
-   F3(A, L8_UNORM, R8_UNORM, C0, C0, C0, xx, UNORM, 8, TB),
-   F3(A, L8_SRGB, R8_UNORM, C0, C0, C0, xx, UNORM, 8, TB),
-   F3(A, L8_SNORM, R8_SNORM, C0, C0, C0, xx, SNORM, 8, TC),
-   I3(A, L8_SINT, R8_SINT, C0, C0, C0, xx, SINT, 8, TR),
-   I3(A, L8_UINT, R8_UINT, C0, C0, C0, xx, UINT, 8, TR),
-   F3(A, L16_UNORM, R16_UNORM, C0, C0, C0, xx, UNORM, 16, TC),
-   F3(A, L16_SNORM, R16_SNORM, C0, C0, C0, xx, SNORM, 16, TC),
-   F3(A, L16_FLOAT, R16_FLOAT, C0, C0, C0, xx, FLOAT, 16, TB),
-   I3(A, L16_SINT, R16_SINT, C0, C0, C0, xx, SINT, 16, TR),
-   I3(A, L16_UINT, R16_UINT, C0, C0, C0, xx, UINT, 16, TR),
-   F3(A, L32_FLOAT, R32_FLOAT, C0, C0, C0, xx, FLOAT, 32, TB),
-   I3(A, L32_SINT, R32_SINT, C0, C0, C0, xx, SINT, 32, TR),
-   I3(A, L32_UINT, R32_UINT, C0, C0, C0, xx, UINT, 32, TR),
-
-   C4(A, I8_UNORM, R8_UNORM, C0, C0, C0, C0, UNORM, 8, TR),
-   C4(A, I8_SNORM, R8_SNORM, C0, C0, C0, C0, SNORM, 8, TR),
-   C4(A, I8_SINT, R8_SINT, C0, C0, C0, C0, SINT, 8, TR),
-   C4(A, I8_UINT, R8_UINT, C0, C0, C0, C0, UINT, 8, TR),
-   C4(A, I16_UNORM, R16_UNORM, C0, C0, C0, C0, UNORM, 16, TR),
-   C4(A, I16_SNORM, R16_SNORM, C0, C0, C0, C0, SNORM, 16, TR),
-   C4(A, I16_FLOAT, R16_FLOAT, C0, C0, C0, C0, FLOAT, 16, TR),
-   C4(A, I16_SINT, R16_SINT, C0, C0, C0, C0, SINT, 16, TR),
-   C4(A, I16_UINT, R16_UINT, C0, C0, C0, C0, UINT, 16, TR),
-   C4(A, I32_FLOAT, R32_FLOAT, C0, C0, C0, C0, FLOAT, 32, TR),
-   C4(A, I32_SINT, R32_SINT, C0, C0, C0, C0, SINT, 32, TR),
-   C4(A, I32_UINT, R32_UINT, C0, C0, C0, C0, UINT, 32, TR),
-
-   A1(A, A8_UNORM, A8_UNORM, xx, xx, xx, C0, UNORM, 8, TB),
-   A1(A, A8_SNORM, R8_SNORM, xx, xx, xx, C0, SNORM, 8, T),
-   A1(A, A8_SINT, R8_SINT, xx, xx, xx, C0, SINT, 8, T),
-   A1(A, A8_UINT, R8_UINT, xx, xx, xx, C0, UINT, 8, T),
-   A1(A, A16_UNORM, R16_UNORM, xx, xx, xx, C0, UNORM, 16, T),
-   A1(A, A16_SNORM, R16_SNORM, xx, xx, xx, C0, SNORM, 16, T),
-   A1(A, A16_FLOAT, R16_FLOAT, xx, xx, xx, C0, FLOAT, 16, T),
-   A1(A, A16_SINT, R16_SINT, xx, xx, xx, C0, SINT, 16, T),
-   A1(A, A16_UINT, R16_UINT, xx, xx, xx, C0, UINT, 16, T),
-   A1(A, A32_FLOAT, R32_FLOAT, xx, xx, xx, C0, FLOAT, 32, T),
-   A1(A, A32_SINT, R32_SINT, xx, xx, xx, C0, SINT, 32, T),
-   A1(A, A32_UINT, R32_UINT, xx, xx, xx, C0, UINT, 32, T),
-
-   C4(A, L4A4_UNORM, NONE, C0, C0, C0, C1, UNORM, 4_4, T),
-   C4(A, L8A8_UNORM, RG8_UNORM, C0, C0, C0, C1, UNORM, 8_8, T),
-   C4(A, L8A8_SNORM, RG8_SNORM, C0, C0, C0, C1, SNORM, 8_8, T),
-   C4(A, L8A8_SRGB, RG8_UNORM, C0, C0, C0, C1, UNORM, 8_8, T),
-   C4(A, L8A8_SINT, RG8_SINT, C0, C0, C0, C1, SINT, 8_8, T),
-   C4(A, L8A8_UINT, RG8_UINT, C0, C0, C0, C1, UINT, 8_8, T),
-   C4(A, L16A16_UNORM, RG16_UNORM, C0, C0, C0, C1, UNORM, 16_16, T),
-   C4(A, L16A16_SNORM, RG16_SNORM, C0, C0, C0, C1, SNORM, 16_16, T),
-   C4(A, L16A16_FLOAT, RG16_FLOAT, C0, C0, C0, C1, FLOAT, 16_16, T),
-   C4(A, L16A16_SINT, RG16_SINT, C0, C0, C0, C1, SINT, 16_16, T),
-   C4(A, L16A16_UINT, RG16_UINT, C0, C0, C0, C1, UINT, 16_16, T),
-   C4(A, L32A32_FLOAT, RG32_FLOAT, C0, C0, C0, C1, FLOAT, 32_32, T),
-   C4(A, L32A32_SINT, RG32_SINT, C0, C0, C0, C1, SINT, 32_32, T),
-   C4(A, L32A32_UINT, RG32_UINT, C0, C0, C0, C1, UINT, 32_32, T),
-
-   F3(A, DXT1_RGB,   NONE, C0, C1, C2, xx, UNORM, DXT1, T),
-   F3(A, DXT1_SRGB,  NONE, C0, C1, C2, xx, UNORM, DXT1, T),
-   C4(A, DXT1_RGBA,  NONE, C0, C1, C2, C3, UNORM, DXT1, T),
-   C4(A, DXT1_SRGBA, NONE, C0, C1, C2, C3, UNORM, DXT1, T),
-   C4(A, DXT3_RGBA,  NONE, C0, C1, C2, C3, UNORM, DXT3, T),
-   C4(A, DXT3_SRGBA, NONE, C0, C1, C2, C3, UNORM, DXT3, T),
-   C4(A, DXT5_RGBA,  NONE, C0, C1, C2, C3, UNORM, DXT5, T),
-   C4(A, DXT5_SRGBA, NONE, C0, C1, C2, C3, UNORM, DXT5, T),
-
-   F1(A, RGTC1_UNORM, NONE, C0, xx, xx, xx, UNORM, RGTC1, T),
-   F1(A, RGTC1_SNORM, NONE, C0, xx, xx, xx, SNORM, RGTC1, T),
-   F2(A, RGTC2_UNORM, NONE, C0, C1, xx, xx, UNORM, RGTC2, T),
-   F2(A, RGTC2_SNORM, NONE, C0, C1, xx, xx, SNORM, RGTC2, T),
-   F3(A, LATC1_UNORM, NONE, C0, C0, C0, xx, UNORM, RGTC1, T),
-   F3(A, LATC1_SNORM, NONE, C0, C0, C0, xx, SNORM, RGTC1, T),
-   C4(A, LATC2_UNORM, NONE, C0, C0, C0, C1, UNORM, RGTC2, T),
-   C4(A, LATC2_SNORM, NONE, C0, C0, C0, C1, SNORM, RGTC2, T),
-
-   C4(C, BPTC_RGBA_UNORM, NONE, C0, C1, C2, C3, UNORM, BPTC, t),
-   C4(C, BPTC_SRGBA,      NONE, C0, C1, C2, C3, UNORM, BPTC, t),
-   F3(C, BPTC_RGB_FLOAT,  NONE, C0, C1, C2, xx, FLOAT, BPTC_FLOAT, t),
-   F3(C, BPTC_RGB_UFLOAT, NONE, C0, C1, C2, xx, FLOAT, BPTC_UFLOAT, t),
-
-   C4(A, R32G32B32A32_FLOAT, RGBA32_FLOAT, C0, C1, C2, C3, FLOAT, 32_32_32_32, IB),
-   C4(A, R32G32B32A32_UNORM, NONE, C0, C1, C2, C3, UNORM, 32_32_32_32, T),
-   C4(A, R32G32B32A32_SNORM, NONE, C0, C1, C2, C3, SNORM, 32_32_32_32, T),
-   C4(A, R32G32B32A32_SINT, RGBA32_SINT, C0, C1, C2, C3, SINT, 32_32_32_32, IR),
-   C4(A, R32G32B32A32_UINT, RGBA32_UINT, C0, C1, C2, C3, UINT, 32_32_32_32, IR),
-   F3(A, R32G32B32X32_FLOAT, RGBX32_FLOAT, C0, C1, C2, xx, FLOAT, 32_32_32_32, TB),
-   I3(A, R32G32B32X32_SINT, RGBX32_SINT, C0, C1, C2, xx, SINT, 32_32_32_32, TR),
-   I3(A, R32G32B32X32_UINT, RGBX32_UINT, C0, C1, C2, xx, UINT, 32_32_32_32, TR),
-
-   F3(C, R32G32B32_FLOAT, NONE, C0, C1, C2, xx, FLOAT, 32_32_32, t),
-   I3(C, R32G32B32_SINT, NONE, C0, C1, C2, xx, SINT, 32_32_32, t),
-   I3(C, R32G32B32_UINT, NONE, C0, C1, C2, xx, UINT, 32_32_32, t),
-
-   F2(A, R32G32_FLOAT, RG32_FLOAT, C0, C1, xx, xx, FLOAT, 32_32, IB),
-   F2(A, R32G32_UNORM, NONE, C0, C1, xx, xx, UNORM, 32_32, T),
-   F2(A, R32G32_SNORM, NONE, C0, C1, xx, xx, SNORM, 32_32, T),
-   I2(A, R32G32_SINT, RG32_SINT, C0, C1, xx, xx, SINT, 32_32, IR),
-   I2(A, R32G32_UINT, RG32_UINT, C0, C1, xx, xx, UINT, 32_32, IR),
-
-   F1(A, R32_FLOAT, R32_FLOAT, C0, xx, xx, xx, FLOAT, 32, IB),
-   F1(A, R32_UNORM, NONE, C0, xx, xx, xx, UNORM, 32, T),
-   F1(A, R32_SNORM, NONE, C0, xx, xx, xx, SNORM, 32, T),
-   I1(A, R32_SINT, R32_SINT, C0, xx, xx, xx, SINT, 32, IR),
-   I1(A, R32_UINT, R32_UINT, C0, xx, xx, xx, UINT, 32, IR),
-
-   C4(A, R16G16B16A16_FLOAT, RGBA16_FLOAT, C0, C1, C2, C3, FLOAT, 16_16_16_16, IB),
-   C4(A, R16G16B16A16_UNORM, RGBA16_UNORM, C0, C1, C2, C3, UNORM, 16_16_16_16, IC),
-   C4(A, R16G16B16A16_SNORM, RGBA16_SNORM, C0, C1, C2, C3, SNORM, 16_16_16_16, IC),
-   C4(A, R16G16B16A16_SINT, RGBA16_SINT, C0, C1, C2, C3, SINT, 16_16_16_16, IR),
-   C4(A, R16G16B16A16_UINT, RGBA16_UINT, C0, C1, C2, C3, UINT, 16_16_16_16, IR),
-   F3(A, R16G16B16X16_FLOAT, RGBX16_FLOAT, C0, C1, C2, xx, FLOAT, 16_16_16_16, TB),
-   F3(A, R16G16B16X16_UNORM, RGBA16_UNORM, C0, C1, C2, xx, UNORM, 16_16_16_16, T),
-   F3(A, R16G16B16X16_SNORM, RGBA16_SNORM, C0, C1, C2, xx, SNORM, 16_16_16_16, T),
-   I3(A, R16G16B16X16_SINT, RGBA16_SINT, C0, C1, C2, xx, SINT, 16_16_16_16, T),
-   I3(A, R16G16B16X16_UINT, RGBA16_UINT, C0, C1, C2, xx, UINT, 16_16_16_16, T),
-
-   F2(A, R16G16_FLOAT, RG16_FLOAT, C0, C1, xx, xx, FLOAT, 16_16, IB),
-   F2(A, R16G16_UNORM, RG16_UNORM, C0, C1, xx, xx, UNORM, 16_16, IC),
-   F2(A, R16G16_SNORM, RG16_SNORM, C0, C1, xx, xx, SNORM, 16_16, IC),
-   I2(A, R16G16_SINT, RG16_SINT, C0, C1, xx, xx, SINT, 16_16, IR),
-   I2(A, R16G16_UINT, RG16_UINT, C0, C1, xx, xx, UINT, 16_16, IR),
-
-   F1(A, R16_FLOAT, R16_FLOAT, C0, xx, xx, xx, FLOAT, 16, IB),
-   F1(A, R16_UNORM, R16_UNORM, C0, xx, xx, xx, UNORM, 16, IC),
-   F1(A, R16_SNORM, R16_SNORM, C0, xx, xx, xx, SNORM, 16, IC),
-   I1(A, R16_SINT, R16_SINT, C0, xx, xx, xx, SINT, 16, IR),
-   I1(A, R16_UINT, R16_UINT, C0, xx, xx, xx, UINT, 16, IR),
-
-   C4(A, R8G8B8A8_SNORM, RGBA8_SNORM, C0, C1, C2, C3, SNORM, 8_8_8_8, IC),
-   C4(A, R8G8B8A8_SINT, RGBA8_SINT, C0, C1, C2, C3, SINT, 8_8_8_8, IR),
-   C4(A, R8G8B8A8_UINT, RGBA8_UINT, C0, C1, C2, C3, UINT, 8_8_8_8, IR),
-   F3(A, R8G8B8X8_SNORM, RGBA8_SNORM, C0, C1, C2, xx, SNORM, 8_8_8_8, T),
-   I3(A, R8G8B8X8_SINT, RGBA8_SINT, C0, C1, C2, xx, SINT, 8_8_8_8, T),
-   I3(A, R8G8B8X8_UINT, RGBA8_UINT, C0, C1, C2, xx, UINT, 8_8_8_8, T),
-
-   F2(A, R8G8_UNORM, RG8_UNORM, C0, C1, xx, xx, UNORM, 8_8, IB),
-   F2(A, R8G8_SNORM, RG8_SNORM, C0, C1, xx, xx, SNORM, 8_8, IC),
-   I2(A, R8G8_SINT, RG8_SINT, C0, C1, xx, xx, SINT, 8_8, IR),
-   I2(A, R8G8_UINT, RG8_UINT, C0, C1, xx, xx, UINT, 8_8, IR),
-
-   F1(A, R8_UNORM, R8_UNORM, C0, xx, xx, xx, UNORM, 8, IB),
-   F1(A, R8_SNORM, R8_SNORM, C0, xx, xx, xx, SNORM, 8, IC),
-   I1(A, R8_SINT, R8_SINT, C0, xx, xx, xx, SINT, 8, IR),
-   I1(A, R8_UINT, R8_UINT, C0, xx, xx, xx, UINT, 8, IR),
-
-   F3(A, R8G8_B8G8_UNORM, NONE, C0, C1, C2, xx, UNORM, U8_YA8_V8_YB8, T),
-   F3(A, G8R8_B8R8_UNORM, NONE, C1, C0, C2, xx, UNORM, U8_YA8_V8_YB8, T),
-   F3(A, G8R8_G8B8_UNORM, NONE, C0, C1, C2, xx, UNORM, YA8_U8_YB8_V8, T),
-   F3(A, R8G8_R8B8_UNORM, NONE, C1, C0, C2, xx, UNORM, YA8_U8_YB8_V8, T),
-
-   F1(A, R1_UNORM, BITMAP, C0, xx, xx, xx, UNORM, BITMAP, T),
-
-   C4(A, R4A4_UNORM, NONE, C0, ZERO, ZERO, C1, UNORM, 4_4, T),
-   C4(A, R8A8_UNORM, NONE, C0, ZERO, ZERO, C1, UNORM, 8_8, T),
-   C4(A, A4R4_UNORM, NONE, C1, ZERO, ZERO, C0, UNORM, 4_4, T),
-   C4(A, A8R8_UNORM, NONE, C1, ZERO, ZERO, C0, UNORM, 8_8, T),
-
-   SF(A, R8SG8SB8UX8U_NORM, 0, C0, C1, C2, ONE_FLOAT, SNORM, SNORM, UNORM, UNORM, 8_8_8_8, T),
-   SF(A, R5SG5SB6U_NORM, 0, C0, C1, C2, ONE_FLOAT, SNORM, SNORM, UNORM, UNORM, 5_5_6, T),
+   C4(A, B8G8R8A8_UNORM, BGRA8_UNORM, B, G, R, A, UNORM, A8B8G8R8, TD),
+   F3(A, B8G8R8X8_UNORM, BGRX8_UNORM, B, G, R, xx, UNORM, A8B8G8R8, TD),
+   C4(A, B8G8R8A8_SRGB, BGRA8_SRGB, B, G, R, A, UNORM, A8B8G8R8, TD),
+   F3(A, B8G8R8X8_SRGB, BGRX8_SRGB, B, G, R, xx, UNORM, A8B8G8R8, TD),
+   C4(A, R8G8B8A8_UNORM, RGBA8_UNORM, R, G, B, A, UNORM, A8B8G8R8, IB),
+   F3(A, R8G8B8X8_UNORM, RGBX8_UNORM, R, G, B, xx, UNORM, A8B8G8R8, TB),
+   C4(A, R8G8B8A8_SRGB, RGBA8_SRGB, R, G, B, A, UNORM, A8B8G8R8, TB),
+   F3(A, R8G8B8X8_SRGB, RGBX8_SRGB, R, G, B, xx, 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, S8Z24, T),
+   SX(A, S8X24_UINT, R, Z24S8, T),
+   SX(A, X32_S8X24_UINT, G, ZF32_X24S8, T),
+
+   F3(A, B5G6R5_UNORM, B5G6R5_UNORM, B, G, R, xx, UNORM, B5G6R5, TD),
+   C4(A, B5G5R5A1_UNORM, BGR5_A1_UNORM, B, G, R, A, UNORM, A1B5G5R5, TD),
+   F3(A, B5G5R5X1_UNORM, BGR5_X1_UNORM, B, G, R, xx, UNORM, A1B5G5R5, TD),
+   C4(A, B4G4R4A4_UNORM, NONE, B, G, R, A, UNORM, A4B4G4R4, T),
+   F3(A, B4G4R4X4_UNORM, NONE, B, G, R, xx, UNORM, A4B4G4R4, T),
+   F3(A, R9G9B9E5_FLOAT, NONE, R, G, B, xx, FLOAT, E5B9G9R9_SHAREDEXP, T),
+
+   C4(A, R10G10B10A2_UNORM, RGB10_A2_UNORM, R, G, B, A, UNORM, A2B10G10R10, IB),
+   C4(A, B10G10R10A2_UNORM, BGR10_A2_UNORM, B, G, R, A, UNORM, A2B10G10R10, TD),
+   C4(A, R10G10B10A2_SNORM, NONE, R, G, B, A, SNORM, A2B10G10R10, T),
+   C4(A, B10G10R10A2_SNORM, NONE, B, G, R, A, SNORM, A2B10G10R10, T),
+   C4(A, R10G10B10A2_UINT, RGB10_A2_UINT, R, G, B, A, UINT, A2B10G10R10, TR),
+   C4(A, B10G10R10A2_UINT, RGB10_A2_UINT, B, G, R, A, UINT, A2B10G10R10, T),
+
+   F3(A, R11G11B10_FLOAT, R11G11B10_FLOAT, R, G, B, xx, FLOAT, BF10GF11RF11, IB),
+
+   F3(A, L8_UNORM, R8_UNORM, R, R, R, xx, UNORM, R8, TB),
+   F3(A, L8_SRGB, R8_UNORM, R, R, R, xx, UNORM, R8, TB),
+   F3(A, L8_SNORM, R8_SNORM, R, R, R, xx, SNORM, R8, TC),
+   I3(A, L8_SINT, R8_SINT, R, R, R, xx, SINT, R8, TR),
+   I3(A, L8_UINT, R8_UINT, R, R, R, xx, UINT, R8, TR),
+   F3(A, L16_UNORM, R16_UNORM, R, R, R, xx, UNORM, R16, TC),
+   F3(A, L16_SNORM, R16_SNORM, R, R, R, xx, SNORM, R16, TC),
+   F3(A, L16_FLOAT, R16_FLOAT, R, R, R, xx, FLOAT, R16, TB),
+   I3(A, L16_SINT, R16_SINT, R, R, R, xx, SINT, R16, TR),
+   I3(A, L16_UINT, R16_UINT, R, R, R, xx, UINT, R16, TR),
+   F3(A, L32_FLOAT, R32_FLOAT, R, R, R, xx, FLOAT, R32, TB),
+   I3(A, L32_SINT, R32_SINT, R, R, R, xx, SINT, R32, TR),
+   I3(A, L32_UINT, R32_UINT, R, R, R, xx, UINT, R32, TR),
+
+   C4(A, I8_UNORM, R8_UNORM, R, R, R, R, UNORM, R8, TR),
+   C4(A, I8_SNORM, R8_SNORM, R, R, R, R, SNORM, R8, TR),
+   C4(A, I8_SINT, R8_SINT, R, R, R, R, SINT, R8, TR),
+   C4(A, I8_UINT, R8_UINT, R, R, R, R, UINT, R8, TR),
+   C4(A, I16_UNORM, R16_UNORM, R, R, R, R, UNORM, R16, TR),
+   C4(A, I16_SNORM, R16_SNORM, R, R, R, R, SNORM, R16, TR),
+   C4(A, I16_FLOAT, R16_FLOAT, R, R, R, R, FLOAT, R16, TR),
+   C4(A, I16_SINT, R16_SINT, R, R, R, R, SINT, R16, TR),
+   C4(A, I16_UINT, R16_UINT, R, R, R, R, UINT, R16, TR),
+   C4(A, I32_FLOAT, R32_FLOAT, R, R, R, R, FLOAT, R32, TR),
+   C4(A, I32_SINT, R32_SINT, R, R, R, R, SINT, R32, TR),
+   C4(A, I32_UINT, R32_UINT, R, R, R, R, UINT, R32, TR),
+
+   A1(A, A8_UNORM, A8_UNORM, xx, xx, xx, R, UNORM, R8, TB),
+   A1(A, A8_SNORM, R8_SNORM, xx, xx, xx, R, SNORM, R8, T),
+   A1(A, A8_SINT, R8_SINT, xx, xx, xx, R, SINT, R8, T),
+   A1(A, A8_UINT, R8_UINT, xx, xx, xx, R, UINT, R8, T),
+   A1(A, A16_UNORM, R16_UNORM, xx, xx, xx, R, UNORM, R16, T),
+   A1(A, A16_SNORM, R16_SNORM, xx, xx, xx, R, SNORM, R16, T),
+   A1(A, A16_FLOAT, R16_FLOAT, xx, xx, xx, R, FLOAT, R16, T),
+   A1(A, A16_SINT, R16_SINT, xx, xx, xx, R, SINT, R16, T),
+   A1(A, A16_UINT, R16_UINT, xx, xx, xx, R, UINT, R16, T),
+   A1(A, A32_FLOAT, R32_FLOAT, xx, xx, xx, R, FLOAT, R32, T),
+   A1(A, A32_SINT, R32_SINT, xx, xx, xx, R, SINT, R32, T),
+   A1(A, A32_UINT, R32_UINT, xx, xx, xx, R, UINT, R32, T),
+
+   C4(A, L4A4_UNORM, NONE, R, R, R, G, UNORM, G4R4, T),
+   C4(A, L8A8_UNORM, RG8_UNORM, R, R, R, G, UNORM, G8R8, T),
+   C4(A, L8A8_SNORM, RG8_SNORM, R, R, R, G, SNORM, G8R8, T),
+   C4(A, L8A8_SRGB, RG8_UNORM, R, R, R, G, UNORM, G8R8, T),
+   C4(A, L8A8_SINT, RG8_SINT, R, R, R, G, SINT, G8R8, T),
+   C4(A, L8A8_UINT, RG8_UINT, R, R, R, G, UINT, G8R8, T),
+   C4(A, L16A16_UNORM, RG16_UNORM, R, R, R, G, UNORM, R16_G16, T),
+   C4(A, L16A16_SNORM, RG16_SNORM, R, R, R, G, SNORM, R16_G16, T),
+   C4(A, L16A16_FLOAT, RG16_FLOAT, R, R, R, G, FLOAT, R16_G16, T),
+   C4(A, L16A16_SINT, RG16_SINT, R, R, R, G, SINT, R16_G16, T),
+   C4(A, L16A16_UINT, RG16_UINT, R, R, R, G, UINT, R16_G16, T),
+   C4(A, L32A32_FLOAT, RG32_FLOAT, R, R, R, G, FLOAT, R32_G32, T),
+   C4(A, L32A32_SINT, RG32_SINT, R, R, R, G, SINT, R32_G32, T),
+   C4(A, L32A32_UINT, RG32_UINT, R, R, R, G, UINT, R32_G32, T),
+
+   F3(A, DXT1_RGB,   NONE, R, G, B, xx, UNORM, DXT1, T),
+   F3(A, DXT1_SRGB,  NONE, R, G, B, xx, UNORM, DXT1, T),
+   C4(A, DXT1_RGBA,  NONE, R, G, B, A, UNORM, DXT1, T),
+   C4(A, DXT1_SRGBA, NONE, R, G, B, A, UNORM, DXT1, T),
+   C4(A, DXT3_RGBA,  NONE, R, G, B, A, UNORM, DXT23, T),
+   C4(A, DXT3_SRGBA, NONE, R, G, B, A, UNORM, DXT23, T),
+   C4(A, DXT5_RGBA,  NONE, R, G, B, A, UNORM, DXT45, T),
+   C4(A, DXT5_SRGBA, NONE, R, G, B, A, UNORM, DXT45, T),
+
+   F1(A, RGTC1_UNORM, NONE, R, xx, xx, xx, UNORM, DXN1, T),
+   F1(A, RGTC1_SNORM, NONE, R, xx, xx, xx, SNORM, DXN1, T),
+   F2(A, RGTC2_UNORM, NONE, R, G, xx, xx, UNORM, DXN2, T),
+   F2(A, RGTC2_SNORM, NONE, R, G, xx, xx, SNORM, DXN2, T),
+   F3(A, LATC1_UNORM, NONE, R, R, R, xx, UNORM, DXN1, T),
+   F3(A, LATC1_SNORM, NONE, R, R, R, xx, SNORM, DXN1, T),
+   C4(A, LATC2_UNORM, NONE, R, R, R, G, UNORM, DXN2, T),
+   C4(A, LATC2_SNORM, NONE, R, R, R, G, SNORM, DXN2, T),
+
+   C4(C, BPTC_RGBA_UNORM, NONE, R, G, B, A, UNORM, BC7U, t),
+   C4(C, BPTC_SRGBA,      NONE, R, G, B, A, UNORM, BC7U, t),
+   F3(C, BPTC_RGB_FLOAT,  NONE, R, G, B, xx, FLOAT, BC6H_SF16, t),
+   F3(C, BPTC_RGB_UFLOAT, NONE, R, G, B, xx, FLOAT, BC6H_UF16, t),
+
+   C4(A, R32G32B32A32_FLOAT, RGBA32_FLOAT, R, G, B, A, FLOAT, R32_G32_B32_A32, IB),
+   C4(A, R32G32B32A32_UNORM, NONE, R, G, B, A, UNORM, R32_G32_B32_A32, T),
+   C4(A, R32G32B32A32_SNORM, NONE, R, G, B, A, SNORM, R32_G32_B32_A32, T),
+   C4(A, R32G32B32A32_SINT, RGBA32_SINT, R, G, B, A, SINT, R32_G32_B32_A32, IR),
+   C4(A, R32G32B32A32_UINT, RGBA32_UINT, R, G, B, A, UINT, R32_G32_B32_A32, IR),
+   F3(A, R32G32B32X32_FLOAT, RGBX32_FLOAT, R, G, B, xx, FLOAT, R32_G32_B32_A32, TB),
+   I3(A, R32G32B32X32_SINT, RGBX32_SINT, R, G, B, xx, SINT, R32_G32_B32_A32, TR),
+   I3(A, R32G32B32X32_UINT, RGBX32_UINT, R, G, B, xx, UINT, R32_G32_B32_A32, TR),
+
+   F3(C, R32G32B32_FLOAT, NONE, R, G, B, xx, FLOAT, R32_G32_B32, t),
+   I3(C, R32G32B32_SINT, NONE, R, G, B, xx, SINT, R32_G32_B32, t),
+   I3(C, R32G32B32_UINT, NONE, R, G, B, xx, UINT, R32_G32_B32, t),
+
+   F2(A, R32G32_FLOAT, RG32_FLOAT, R, G, xx, xx, FLOAT, R32_G32, IB),
+   F2(A, R32G32_UNORM, NONE, R, G, xx, xx, UNORM, R32_G32, T),
+   F2(A, R32G32_SNORM, NONE, R, G, xx, xx, SNORM, R32_G32, T),
+   I2(A, R32G32_SINT, RG32_SINT, R, G, xx, xx, SINT, R32_G32, IR),
+   I2(A, R32G32_UINT, RG32_UINT, R, G, xx, xx, UINT, R32_G32, IR),
+
+   F1(A, R32_FLOAT, R32_FLOAT, R, xx, xx, xx, FLOAT, R32, IB),
+   F1(A, R32_UNORM, NONE, R, xx, xx, xx, UNORM, R32, T),
+   F1(A, R32_SNORM, NONE, R, xx, xx, xx, SNORM, R32, T),
+   I1(A, R32_SINT, R32_SINT, R, xx, xx, xx, SINT, R32, IR),
+   I1(A, R32_UINT, R32_UINT, R, xx, xx, xx, UINT, R32, IR),
+
+   C4(A, R16G16B16A16_FLOAT, RGBA16_FLOAT, R, G, B, A, FLOAT, R16_G16_B16_A16, IB),
+   C4(A, R16G16B16A16_UNORM, RGBA16_UNORM, R, G, B, A, UNORM, R16_G16_B16_A16, IC),
+   C4(A, R16G16B16A16_SNORM, RGBA16_SNORM, R, G, B, A, SNORM, R16_G16_B16_A16, IC),
+   C4(A, R16G16B16A16_SINT, RGBA16_SINT, R, G, B, A, SINT, R16_G16_B16_A16, IR),
+   C4(A, R16G16B16A16_UINT, RGBA16_UINT, R, G, B, A, UINT, R16_G16_B16_A16, IR),
+   F3(A, R16G16B16X16_FLOAT, RGBX16_FLOAT, R, G, B, xx, FLOAT, R16_G16_B16_A16, TB),
+   F3(A, R16G16B16X16_UNORM, RGBA16_UNORM, R, G, B, xx, UNORM, R16_G16_B16_A16, T),
+   F3(A, R16G16B16X16_SNORM, RGBA16_SNORM, R, G, B, xx, SNORM, R16_G16_B16_A16, T),
+   I3(A, R16G16B16X16_SINT, RGBA16_SINT, R, G, B, xx, SINT, R16_G16_B16_A16, T),
+   I3(A, R16G16B16X16_UINT, RGBA16_UINT, R, G, B, xx, UINT, R16_G16_B16_A16, T),
+
+   F2(A, R16G16_FLOAT, RG16_FLOAT, R, G, xx, xx, FLOAT, R16_G16, IB),
+   F2(A, R16G16_UNORM, RG16_UNORM, R, G, xx, xx, UNORM, R16_G16, IC),
+   F2(A, R16G16_SNORM, RG16_SNORM, R, G, xx, xx, SNORM, R16_G16, IC),
+   I2(A, R16G16_SINT, RG16_SINT, R, G, xx, xx, SINT, R16_G16, IR),
+   I2(A, R16G16_UINT, RG16_UINT, R, G, xx, xx, UINT, R16_G16, IR),
+
+   F1(A, R16_FLOAT, R16_FLOAT, R, xx, xx, xx, FLOAT, R16, IB),
+   F1(A, R16_UNORM, R16_UNORM, R, xx, xx, xx, UNORM, R16, IC),
+   F1(A, R16_SNORM, R16_SNORM, R, xx, xx, xx, SNORM, R16, IC),
+   I1(A, R16_SINT, R16_SINT, R, xx, xx, xx, SINT, R16, IR),
+   I1(A, R16_UINT, R16_UINT, R, xx, xx, xx, UINT, R16, IR),
+
+   C4(A, R8G8B8A8_SNORM, RGBA8_SNORM, R, G, B, A, SNORM, A8B8G8R8, IC),
+   C4(A, R8G8B8A8_SINT, RGBA8_SINT, R, G, B, A, SINT, A8B8G8R8, IR),
+   C4(A, R8G8B8A8_UINT, RGBA8_UINT, R, G, B, A, UINT, A8B8G8R8, IR),
+   F3(A, R8G8B8X8_SNORM, RGBA8_SNORM, R, G, B, xx, SNORM, A8B8G8R8, T),
+   I3(A, R8G8B8X8_SINT, RGBA8_SINT, R, G, B, xx, SINT, A8B8G8R8, T),
+   I3(A, R8G8B8X8_UINT, RGBA8_UINT, R, G, B, xx, UINT, A8B8G8R8, T),
+
+   F2(A, R8G8_UNORM, RG8_UNORM, R, G, xx, xx, UNORM, G8R8, IB),
+   F2(A, R8G8_SNORM, RG8_SNORM, R, G, xx, xx, SNORM, G8R8, IC),
+   I2(A, R8G8_SINT, RG8_SINT, R, G, xx, xx, SINT, G8R8, IR),
+   I2(A, R8G8_UINT, RG8_UINT, R, G, xx, xx, UINT, G8R8, IR),
+
+   F1(A, R8_UNORM, R8_UNORM, R, xx, xx, xx, UNORM, R8, IB),
+   F1(A, R8_SNORM, R8_SNORM, R, xx, xx, xx, SNORM, R8, IC),
+   I1(A, R8_SINT, R8_SINT, R, xx, xx, xx, SINT, R8, IR),
+   I1(A, R8_UINT, R8_UINT, R, xx, xx, xx, UINT, R8, IR),
+
+   F3(A, R8G8_B8G8_UNORM, NONE, R, G, B, xx, UNORM, G8B8G8R8, T),
+   F3(A, G8R8_B8R8_UNORM, NONE, G, R, B, xx, UNORM, G8B8G8R8, T),
+   F3(A, G8R8_G8B8_UNORM, NONE, R, G, B, xx, UNORM, B8G8R8G8, T),
+   F3(A, R8G8_R8B8_UNORM, NONE, G, R, B, xx, UNORM, B8G8R8G8, T),
+
+   F1(A, R1_UNORM, BITMAP, R, xx, xx, xx, UNORM, R1, T),
+
+   C4(A, R4A4_UNORM, NONE, R, ZERO, ZERO, G, UNORM, G4R4, T),
+   C4(A, R8A8_UNORM, NONE, R, ZERO, ZERO, G, UNORM, G8R8, T),
+   C4(A, A4R4_UNORM, NONE, G, ZERO, ZERO, R, UNORM, G4R4, T),
+   C4(A, A8R8_UNORM, NONE, G, ZERO, ZERO, R, UNORM, G8R8, T),
+
+   SF(A, R8SG8SB8UX8U_NORM, 0, R, G, B, ONE_FLOAT, SNORM, SNORM, UNORM, UNORM, A8B8G8R8, T),
+   SF(A, R5SG5SB6U_NORM, 0, R, G, B, ONE_FLOAT, SNORM, SNORM, UNORM, UNORM, B6G5R5, T),
 };
 
 #if NOUVEAU_DRIVER == 0xc0