etnaviv: remove swizzle from format table

The only format that needs swizzle is R8 emulated with L8, so we can get
rid of the SWIZ(X, Y, Z, W) everywhere.

Note: R8G8 also had a swizzle, but it wasn't necessary.

Signed-off-by: Jonathan Marek <[email protected]>
Reviewed-by: Christian Gmeiner <[email protected]>

1 files changed, 65 insertions, 80 deletions

diff --git a/src/gallium/drivers/etnaviv/etnaviv_format.c b/src/gallium/drivers/etnaviv/etnaviv_format.c
index ce87f57d9f3..b4acaf7a0e9 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_format.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_format.c
@@ -41,7 +41,6 @@ struct etna_format {
    unsigned tex;
    unsigned pe;
    bool present;
-   const unsigned char tex_swiz[4];
 };
 
 #define PE_FORMAT_NONE ~0
@@ -55,31 +54,22 @@ struct etna_format {
 
 #define TS_SAMPLER_FORMAT_NONE      ETNA_NO_MATCH
 
-#define SWIZ(x,y,z,w) {    \
-   PIPE_SWIZZLE_##x,       \
-   PIPE_SWIZZLE_##y,       \
-   PIPE_SWIZZLE_##z,       \
-   PIPE_SWIZZLE_##w        \
-}
-
 /* vertex + texture */
-#define VT(pipe, vtxfmt, texfmt, texswiz, rsfmt)          \
+#define VT(pipe, vtxfmt, texfmt, rsfmt)          \
    [PIPE_FORMAT_##pipe] = {                               \
       .vtx = FE_DATA_TYPE_##vtxfmt, \
       .tex = TEXTURE_FORMAT_##texfmt,                     \
       .pe = PE_FORMAT_##rsfmt,                            \
       .present = 1,                                       \
-      .tex_swiz = texswiz,                                \
    }
 
 /* texture-only */
-#define _T(pipe, fmt, swiz, rsfmt) \
+#define _T(pipe, fmt, rsfmt) \
    [PIPE_FORMAT_##pipe] = {        \
       .vtx = ETNA_NO_MATCH,        \
       .tex = TEXTURE_FORMAT_##fmt, \
       .pe = PE_FORMAT_##rsfmt,     \
       .present = 1,                \
-      .tex_swiz = swiz,            \
    }
 
 /* vertex-only */
@@ -93,16 +83,16 @@ struct etna_format {
 
 static struct etna_format formats[PIPE_FORMAT_COUNT] = {
    /* 8-bit */
-   VT(R8_UNORM,   UNSIGNED_BYTE, L8, SWIZ(X, 0, 0, 1), NONE),
+   VT(R8_UNORM,   UNSIGNED_BYTE, L8, NONE),
    V_(R8_SNORM,   BYTE,          NONE),
    V_(R8_UINT,    BYTE_I,        NONE),
    V_(R8_SINT,    BYTE_I,        NONE),
    V_(R8_USCALED, UNSIGNED_BYTE, NONE),
    V_(R8_SSCALED, BYTE,          NONE),
 
-   _T(A8_UNORM, A8, SWIZ(X, Y, Z, W), NONE),
-   _T(L8_UNORM, L8, SWIZ(X, Y, Z, W), NONE),
-   _T(I8_UNORM, I8, SWIZ(X, Y, Z, W), NONE),
+   _T(A8_UNORM, A8, NONE),
+   _T(L8_UNORM, L8, NONE),
+   _T(I8_UNORM, I8, NONE),
 
    /* 16-bit */
    V_(R16_UNORM,   UNSIGNED_SHORT, NONE),
@@ -113,17 +103,17 @@ static struct etna_format formats[PIPE_FORMAT_COUNT] = {
    V_(R16_SSCALED, SHORT,          NONE),
    V_(R16_FLOAT,   HALF_FLOAT,     NONE),
 
-   _T(B4G4R4A4_UNORM, A4R4G4B4, SWIZ(X, Y, Z, W), A4R4G4B4),
-   _T(B4G4R4X4_UNORM, X4R4G4B4, SWIZ(X, Y, Z, W), X4R4G4B4),
+   _T(B4G4R4A4_UNORM, A4R4G4B4, A4R4G4B4),
+   _T(B4G4R4X4_UNORM, X4R4G4B4, X4R4G4B4),
 
-   _T(L8A8_UNORM, A8L8, SWIZ(X, Y, Z, W), NONE),
+   _T(L8A8_UNORM, A8L8, NONE),
 
-   _T(Z16_UNORM,      D16,      SWIZ(X, Y, Z, W), NONE),
-   _T(B5G6R5_UNORM,   R5G6B5,   SWIZ(X, Y, Z, W), R5G6B5),
-   _T(B5G5R5A1_UNORM, A1R5G5B5, SWIZ(X, Y, Z, W), A1R5G5B5),
-   _T(B5G5R5X1_UNORM, X1R5G5B5, SWIZ(X, Y, Z, W), X1R5G5B5),
+   _T(Z16_UNORM,      D16,      NONE),
+   _T(B5G6R5_UNORM,   R5G6B5,   R5G6B5),
+   _T(B5G5R5A1_UNORM, A1R5G5B5, A1R5G5B5),
+   _T(B5G5R5X1_UNORM, X1R5G5B5, X1R5G5B5),
 
-   VT(R8G8_UNORM,   UNSIGNED_BYTE,  EXT_G8R8 | EXT_FORMAT, SWIZ(X, Y, 0, 1), NONE),
+   VT(R8G8_UNORM,   UNSIGNED_BYTE,  EXT_G8R8 | EXT_FORMAT, NONE),
    V_(R8G8_SNORM,   BYTE,           NONE),
    V_(R8G8_UINT,    BYTE_I,         NONE),
    V_(R8G8_SINT,    BYTE_I,         NONE),
@@ -158,24 +148,24 @@ static struct etna_format formats[PIPE_FORMAT_COUNT] = {
 
    V_(A8B8G8R8_UNORM,   UNSIGNED_BYTE, NONE),
 
-   VT(R8G8B8A8_UNORM,   UNSIGNED_BYTE, A8B8G8R8, SWIZ(X, Y, Z, W), A8B8G8R8),
+   VT(R8G8B8A8_UNORM,   UNSIGNED_BYTE, A8B8G8R8, A8B8G8R8),
    V_(R8G8B8A8_SNORM,   BYTE,          A8B8G8R8),
-   _T(R8G8B8X8_UNORM,   X8B8G8R8,      SWIZ(X, Y, Z, W), X8B8G8R8),
+   _T(R8G8B8X8_UNORM,   X8B8G8R8,      X8B8G8R8),
    V_(R8G8B8A8_UINT,    BYTE_I,        A8B8G8R8),
    V_(R8G8B8A8_SINT,    BYTE_I,        A8B8G8R8),
    V_(R8G8B8A8_USCALED, UNSIGNED_BYTE, A8B8G8R8),
    V_(R8G8B8A8_SSCALED, BYTE,          A8B8G8R8),
 
-   _T(B8G8R8A8_UNORM, A8R8G8B8, SWIZ(X, Y, Z, W), A8R8G8B8),
-   _T(B8G8R8X8_UNORM, X8R8G8B8, SWIZ(X, Y, Z, W), X8R8G8B8),
+   _T(B8G8R8A8_UNORM, A8R8G8B8, A8R8G8B8),
+   _T(B8G8R8X8_UNORM, X8R8G8B8, X8R8G8B8),
 
    V_(R10G10B10A2_UNORM,   UNSIGNED_INT_2_10_10_10_REV, NONE),
    V_(R10G10B10A2_SNORM,   INT_2_10_10_10_REV,          NONE),
    V_(R10G10B10A2_USCALED, UNSIGNED_INT_2_10_10_10_REV, NONE),
    V_(R10G10B10A2_SSCALED, INT_2_10_10_10_REV,          NONE),
 
-   _T(X8Z24_UNORM,       D24X8, SWIZ(X, Y, Z, W), NONE),
-   _T(S8_UINT_Z24_UNORM, D24X8, SWIZ(X, Y, Z, W), NONE),
+   _T(X8Z24_UNORM,       D24X8, NONE),
+   _T(S8_UINT_Z24_UNORM, D24X8, NONE),
 
    /* 48-bit */
    V_(R16G16B16_UNORM,   UNSIGNED_SHORT, NONE),
@@ -225,39 +215,39 @@ static struct etna_format formats[PIPE_FORMAT_COUNT] = {
    V_(R32G32B32A32_FIXED,   FIXED,        NONE),
 
    /* compressed */
-   _T(ETC1_RGB8, ETC1, SWIZ(X, Y, Z, W), NONE),
-
-   _T(DXT1_RGB,  DXT1,      SWIZ(X, Y, Z, W), NONE),
-   _T(DXT1_RGBA, DXT1,      SWIZ(X, Y, Z, W), NONE),
-   _T(DXT3_RGBA, DXT2_DXT3, SWIZ(X, Y, Z, W), NONE),
-   _T(DXT5_RGBA, DXT4_DXT5, SWIZ(X, Y, Z, W), NONE),
-
-   _T(ETC2_RGB8,       EXT_NONE | EXT_FORMAT,                          SWIZ(X, Y, Z, W), NONE), /* Extd. format NONE doubles as ETC2_RGB8 */
-   _T(ETC2_RGB8A1,     EXT_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 | EXT_FORMAT, SWIZ(X, Y, Z, W), NONE),
-   _T(ETC2_RGBA8,      EXT_RGBA8_ETC2_EAC | EXT_FORMAT,                SWIZ(X, Y, Z, W), NONE),
-   _T(ETC2_R11_UNORM,  EXT_R11_EAC | EXT_FORMAT,                       SWIZ(X, Y, Z, W), NONE),
-   _T(ETC2_R11_SNORM,  EXT_SIGNED_R11_EAC | EXT_FORMAT,                SWIZ(X, Y, Z, W), NONE),
-   _T(ETC2_RG11_UNORM, EXT_RG11_EAC | EXT_FORMAT,                      SWIZ(X, Y, Z, W), NONE),
-   _T(ETC2_RG11_SNORM, EXT_SIGNED_RG11_EAC | EXT_FORMAT,               SWIZ(X, Y, Z, W), NONE),
-
-   _T(ASTC_4x4,        ASTC_RGBA_4x4 | ASTC_FORMAT,                    SWIZ(X, Y, Z, W), NONE),
-   _T(ASTC_5x4,        ASTC_RGBA_5x4 | ASTC_FORMAT,                    SWIZ(X, Y, Z, W), NONE),
-   _T(ASTC_5x5,        ASTC_RGBA_5x5 | ASTC_FORMAT,                    SWIZ(X, Y, Z, W), NONE),
-   _T(ASTC_6x5,        ASTC_RGBA_6x5 | ASTC_FORMAT,                    SWIZ(X, Y, Z, W), NONE),
-   _T(ASTC_6x6,        ASTC_RGBA_6x6 | ASTC_FORMAT,                    SWIZ(X, Y, Z, W), NONE),
-   _T(ASTC_8x5,        ASTC_RGBA_8x5 | ASTC_FORMAT,                    SWIZ(X, Y, Z, W), NONE),
-   _T(ASTC_8x6,        ASTC_RGBA_8x6 | ASTC_FORMAT,                    SWIZ(X, Y, Z, W), NONE),
-   _T(ASTC_8x8,        ASTC_RGBA_8x8 | ASTC_FORMAT,                    SWIZ(X, Y, Z, W), NONE),
-   _T(ASTC_10x5,       ASTC_RGBA_10x5 | ASTC_FORMAT,                   SWIZ(X, Y, Z, W), NONE),
-   _T(ASTC_10x6,       ASTC_RGBA_10x6 | ASTC_FORMAT,                   SWIZ(X, Y, Z, W), NONE),
-   _T(ASTC_10x8,       ASTC_RGBA_10x8 | ASTC_FORMAT,                   SWIZ(X, Y, Z, W), NONE),
-   _T(ASTC_10x10,      ASTC_RGBA_10x10 | ASTC_FORMAT,                  SWIZ(X, Y, Z, W), NONE),
-   _T(ASTC_12x10,      ASTC_RGBA_12x10 | ASTC_FORMAT,                  SWIZ(X, Y, Z, W), NONE),
-   _T(ASTC_12x12,      ASTC_RGBA_12x12 | ASTC_FORMAT,                  SWIZ(X, Y, Z, W), NONE),
+   _T(ETC1_RGB8, ETC1, NONE),
+
+   _T(DXT1_RGB,  DXT1,      NONE),
+   _T(DXT1_RGBA, DXT1,      NONE),
+   _T(DXT3_RGBA, DXT2_DXT3, NONE),
+   _T(DXT5_RGBA, DXT4_DXT5, NONE),
+
+   _T(ETC2_RGB8,       EXT_NONE | EXT_FORMAT,                          NONE), /* Extd. format NONE doubles as ETC2_RGB8 */
+   _T(ETC2_RGB8A1,     EXT_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 | EXT_FORMAT, NONE),
+   _T(ETC2_RGBA8,      EXT_RGBA8_ETC2_EAC | EXT_FORMAT,                NONE),
+   _T(ETC2_R11_UNORM,  EXT_R11_EAC | EXT_FORMAT,                       NONE),
+   _T(ETC2_R11_SNORM,  EXT_SIGNED_R11_EAC | EXT_FORMAT,                NONE),
+   _T(ETC2_RG11_UNORM, EXT_RG11_EAC | EXT_FORMAT,                      NONE),
+   _T(ETC2_RG11_SNORM, EXT_SIGNED_RG11_EAC | EXT_FORMAT,               NONE),
+
+   _T(ASTC_4x4,        ASTC_RGBA_4x4 | ASTC_FORMAT,                    NONE),
+   _T(ASTC_5x4,        ASTC_RGBA_5x4 | ASTC_FORMAT,                    NONE),
+   _T(ASTC_5x5,        ASTC_RGBA_5x5 | ASTC_FORMAT,                    NONE),
+   _T(ASTC_6x5,        ASTC_RGBA_6x5 | ASTC_FORMAT,                    NONE),
+   _T(ASTC_6x6,        ASTC_RGBA_6x6 | ASTC_FORMAT,                    NONE),
+   _T(ASTC_8x5,        ASTC_RGBA_8x5 | ASTC_FORMAT,                    NONE),
+   _T(ASTC_8x6,        ASTC_RGBA_8x6 | ASTC_FORMAT,                    NONE),
+   _T(ASTC_8x8,        ASTC_RGBA_8x8 | ASTC_FORMAT,                    NONE),
+   _T(ASTC_10x5,       ASTC_RGBA_10x5 | ASTC_FORMAT,                   NONE),
+   _T(ASTC_10x6,       ASTC_RGBA_10x6 | ASTC_FORMAT,                   NONE),
+   _T(ASTC_10x8,       ASTC_RGBA_10x8 | ASTC_FORMAT,                   NONE),
+   _T(ASTC_10x10,      ASTC_RGBA_10x10 | ASTC_FORMAT,                  NONE),
+   _T(ASTC_12x10,      ASTC_RGBA_12x10 | ASTC_FORMAT,                  NONE),
+   _T(ASTC_12x12,      ASTC_RGBA_12x12 | ASTC_FORMAT,                  NONE),
 
    /* YUV */
-   _T(YUYV, YUY2, SWIZ(X, Y, Z, W), YUY2),
-   _T(UYVY, UYVY, SWIZ(X, Y, Z, W), NONE),
+   _T(YUYV, YUY2, YUY2),
+   _T(UYVY, UYVY, NONE),
 };
 
 uint32_t
@@ -308,15 +298,7 @@ texture_use_int_filter(const struct pipe_sampler_view *so, bool tex_desc)
 bool
 texture_format_needs_swiz(enum pipe_format fmt)
 {
-   static const unsigned char def[4] = SWIZ(X, Y, Z, W);
-   bool swiz = false;
-
-   fmt = util_format_linear(fmt);
-
-   if (formats[fmt].present)
-      swiz = !!memcmp(def, formats[fmt].tex_swiz, sizeof(formats[fmt].tex_swiz));
-
-   return swiz;
+   return util_format_linear(fmt) == PIPE_FORMAT_R8_UNORM;
 }
 
 uint32_t
@@ -325,12 +307,15 @@ get_texture_swiz(enum pipe_format fmt, unsigned swizzle_r,
 {
    unsigned char swiz[4] = {
       swizzle_r, swizzle_g, swizzle_b, swizzle_a,
-   }, rswiz[4];
-
-   fmt = util_format_linear(fmt);
-
-   assert(formats[fmt].present);
-   util_format_compose_swizzles(formats[fmt].tex_swiz, swiz, rswiz);
+   };
+
+   if (util_format_linear(fmt) == PIPE_FORMAT_R8_UNORM) {
+      /* R8 is emulated with L8, needs yz channels set to zero */
+      for (unsigned i = 0; i < 4; i++) {
+         if (swiz[i] == PIPE_SWIZZLE_Y || swiz[i] == PIPE_SWIZZLE_Z)
+            swiz[i] = PIPE_SWIZZLE_0;
+      }
+   }
 
    /* PIPE_SWIZZLE_ maps 1:1 to TEXTURE_SWIZZLE_ */
    STATIC_ASSERT(PIPE_SWIZZLE_X == TEXTURE_SWIZZLE_RED);
@@ -340,10 +325,10 @@ get_texture_swiz(enum pipe_format fmt, unsigned swizzle_r,
    STATIC_ASSERT(PIPE_SWIZZLE_0 == TEXTURE_SWIZZLE_ZERO);
    STATIC_ASSERT(PIPE_SWIZZLE_1 == TEXTURE_SWIZZLE_ONE);
 
-   return VIVS_TE_SAMPLER_CONFIG1_SWIZZLE_R(rswiz[0]) |
-          VIVS_TE_SAMPLER_CONFIG1_SWIZZLE_G(rswiz[1]) |
-          VIVS_TE_SAMPLER_CONFIG1_SWIZZLE_B(rswiz[2]) |
-          VIVS_TE_SAMPLER_CONFIG1_SWIZZLE_A(rswiz[3]);
+   return VIVS_TE_SAMPLER_CONFIG1_SWIZZLE_R(swiz[0]) |
+          VIVS_TE_SAMPLER_CONFIG1_SWIZZLE_G(swiz[1]) |
+          VIVS_TE_SAMPLER_CONFIG1_SWIZZLE_B(swiz[2]) |
+          VIVS_TE_SAMPLER_CONFIG1_SWIZZLE_A(swiz[3]);
 }
 
 uint32_t