util: Don't commit u_format_table.c

At least not until stabilizes, to reduce noise.

2 files changed, 1 insertions, 1925 deletions

diff --git a/src/gallium/auxiliary/util/.gitignore b/src/gallium/auxiliary/util/.gitignore
new file mode 100644
index 0000000000..53fe9b8a65
--- /dev/null
+++ b/src/gallium/auxiliary/util/.gitignore
@@ -0,0 +1 @@
+u_format_table.c
diff --git a/src/gallium/auxiliary/util/u_format_table.c b/src/gallium/auxiliary/util/u_format_table.c
deleted file mode 100644
index ea19d2fb79..0000000000
--- a/src/gallium/auxiliary/util/u_format_table.c
+++ /dev/null
@@ -1,1925 +0,0 @@
-/* This file is autogenerated by u_format_table.py from u_format.csv. Do not edit directly. */
-
-/**************************************************************************
- *
- * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- **************************************************************************/
-
-#include "u_format.h"
-
-const struct util_format_description
-util_format_description_table[] = 
-{
-   {
-      PIPE_FORMAT_A8R8G8B8_UNORM,
-      "PIPE_FORMAT_A8R8G8B8_UNORM",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_Z, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_X, /* b */
-         UTIL_FORMAT_SWIZZLE_W /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_X8R8G8B8_UNORM,
-      "PIPE_FORMAT_X8R8G8B8_UNORM",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_Z, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_X, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_B8G8R8A8_UNORM,
-      "PIPE_FORMAT_B8G8R8A8_UNORM",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_W /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_B8G8R8X8_UNORM,
-      "PIPE_FORMAT_B8G8R8X8_UNORM",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_A1R5G5B5_UNORM,
-      "PIPE_FORMAT_A1R5G5B5_UNORM",
-      {1, 1, 16}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 5}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 5}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 5}, /* z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 1} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_Z, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_X, /* b */
-         UTIL_FORMAT_SWIZZLE_W /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_A4R4G4B4_UNORM,
-      "PIPE_FORMAT_A4R4G4B4_UNORM",
-      {1, 1, 16}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 4}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 4}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 4}, /* z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 4} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_Z, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_X, /* b */
-         UTIL_FORMAT_SWIZZLE_W /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R5G6B5_UNORM,
-      "PIPE_FORMAT_R5G6B5_UNORM",
-      {1, 1, 16}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 5}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 6}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 5}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_Z, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_X, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_A2B10G10R10_UNORM,
-      "PIPE_FORMAT_A2B10G10R10_UNORM",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 10}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 10}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 10}, /* z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 2} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_W, /* r */
-         UTIL_FORMAT_SWIZZLE_Z, /* g */
-         UTIL_FORMAT_SWIZZLE_Y, /* b */
-         UTIL_FORMAT_SWIZZLE_X /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_L8_UNORM,
-      "PIPE_FORMAT_L8_UNORM",
-      {1, 1, 8}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_X, /* g */
-         UTIL_FORMAT_SWIZZLE_X, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_A8_UNORM,
-      "PIPE_FORMAT_A8_UNORM",
-      {1, 1, 8}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_0, /* r */
-         UTIL_FORMAT_SWIZZLE_0, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_X /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_I8_UNORM,
-      "PIPE_FORMAT_I8_UNORM",
-      {1, 1, 8}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_X, /* g */
-         UTIL_FORMAT_SWIZZLE_X, /* b */
-         UTIL_FORMAT_SWIZZLE_X /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_A8L8_UNORM,
-      "PIPE_FORMAT_A8L8_UNORM",
-      {1, 1, 16}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_X, /* g */
-         UTIL_FORMAT_SWIZZLE_X, /* b */
-         UTIL_FORMAT_SWIZZLE_Y /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_L16_UNORM,
-      "PIPE_FORMAT_L16_UNORM",
-      {1, 1, 16}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 16}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_X, /* g */
-         UTIL_FORMAT_SWIZZLE_X, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_Z16_UNORM,
-      "PIPE_FORMAT_Z16_UNORM",
-      {1, 1, 16}, /* block */
-      UTIL_FORMAT_LAYOUT_ZS,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 16}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* z */
-         UTIL_FORMAT_SWIZZLE_0, /* s */
-         UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-         UTIL_FORMAT_SWIZZLE_NONE /* ignored */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_Z32_UNORM,
-      "PIPE_FORMAT_Z32_UNORM",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_ZS,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* z */
-         UTIL_FORMAT_SWIZZLE_0, /* s */
-         UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-         UTIL_FORMAT_SWIZZLE_NONE /* ignored */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_Z32_FLOAT,
-      "PIPE_FORMAT_Z32_FLOAT",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_ZS,
-      {
-         {UTIL_FORMAT_TYPE_FLOAT, FALSE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* z */
-         UTIL_FORMAT_SWIZZLE_0, /* s */
-         UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-         UTIL_FORMAT_SWIZZLE_NONE /* ignored */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_S8Z24_UNORM,
-      "PIPE_FORMAT_S8Z24_UNORM",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_ZS,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 24}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_Y, /* z */
-         UTIL_FORMAT_SWIZZLE_X, /* s */
-         UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-         UTIL_FORMAT_SWIZZLE_NONE /* ignored */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_Z24S8_UNORM,
-      "PIPE_FORMAT_Z24S8_UNORM",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_ZS,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 24}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* z */
-         UTIL_FORMAT_SWIZZLE_Y, /* s */
-         UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-         UTIL_FORMAT_SWIZZLE_NONE /* ignored */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_X8Z24_UNORM,
-      "PIPE_FORMAT_X8Z24_UNORM",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_ZS,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 24}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_Y, /* z */
-         UTIL_FORMAT_SWIZZLE_0, /* s */
-         UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-         UTIL_FORMAT_SWIZZLE_NONE /* ignored */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_Z24X8_UNORM,
-      "PIPE_FORMAT_Z24X8_UNORM",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_ZS,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 24}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* z */
-         UTIL_FORMAT_SWIZZLE_0, /* s */
-         UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-         UTIL_FORMAT_SWIZZLE_NONE /* ignored */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_S8_UNORM,
-      "PIPE_FORMAT_S8_UNORM",
-      {1, 1, 8}, /* block */
-      UTIL_FORMAT_LAYOUT_ZS,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_0, /* z */
-         UTIL_FORMAT_SWIZZLE_X, /* s */
-         UTIL_FORMAT_SWIZZLE_NONE, /* ignored */
-         UTIL_FORMAT_SWIZZLE_NONE /* ignored */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R64_FLOAT,
-      "PIPE_FORMAT_R64_FLOAT",
-      {1, 1, 64}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_FLOAT, FALSE, 64}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_0, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R64G64_FLOAT,
-      "PIPE_FORMAT_R64G64_FLOAT",
-      {1, 1, 128}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_FLOAT, FALSE, 64}, /* x */
-         {UTIL_FORMAT_TYPE_FLOAT, FALSE, 64}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R64G64B64_FLOAT,
-      "PIPE_FORMAT_R64G64B64_FLOAT",
-      {1, 1, 192}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_FLOAT, FALSE, 64}, /* x */
-         {UTIL_FORMAT_TYPE_FLOAT, FALSE, 64}, /* y */
-         {UTIL_FORMAT_TYPE_FLOAT, FALSE, 64}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R64G64B64A64_FLOAT,
-      "PIPE_FORMAT_R64G64B64A64_FLOAT",
-      {1, 1, 256}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_FLOAT, FALSE, 64}, /* x */
-         {UTIL_FORMAT_TYPE_FLOAT, FALSE, 64}, /* y */
-         {UTIL_FORMAT_TYPE_FLOAT, FALSE, 64}, /* z */
-         {UTIL_FORMAT_TYPE_FLOAT, FALSE, 64} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_W /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32_FLOAT,
-      "PIPE_FORMAT_R32_FLOAT",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_FLOAT, FALSE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_0, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32G32_FLOAT,
-      "PIPE_FORMAT_R32G32_FLOAT",
-      {1, 1, 64}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_FLOAT, FALSE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_FLOAT, FALSE, 32}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32G32B32_FLOAT,
-      "PIPE_FORMAT_R32G32B32_FLOAT",
-      {1, 1, 96}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_FLOAT, FALSE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_FLOAT, FALSE, 32}, /* y */
-         {UTIL_FORMAT_TYPE_FLOAT, FALSE, 32}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32G32B32A32_FLOAT,
-      "PIPE_FORMAT_R32G32B32A32_FLOAT",
-      {1, 1, 128}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_FLOAT, FALSE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_FLOAT, FALSE, 32}, /* y */
-         {UTIL_FORMAT_TYPE_FLOAT, FALSE, 32}, /* z */
-         {UTIL_FORMAT_TYPE_FLOAT, FALSE, 32} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_W /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32_UNORM,
-      "PIPE_FORMAT_R32_UNORM",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_0, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32G32_UNORM,
-      "PIPE_FORMAT_R32G32_UNORM",
-      {1, 1, 64}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 32}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32G32B32_UNORM,
-      "PIPE_FORMAT_R32G32B32_UNORM",
-      {1, 1, 96}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 32}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 32}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32G32B32A32_UNORM,
-      "PIPE_FORMAT_R32G32B32A32_UNORM",
-      {1, 1, 128}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 32}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 32}, /* z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 32} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_W /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32_USCALED,
-      "PIPE_FORMAT_R32_USCALED",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_0, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32G32_USCALED,
-      "PIPE_FORMAT_R32G32_USCALED",
-      {1, 1, 64}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 32}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32G32B32_USCALED,
-      "PIPE_FORMAT_R32G32B32_USCALED",
-      {1, 1, 96}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 32}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 32}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32G32B32A32_USCALED,
-      "PIPE_FORMAT_R32G32B32A32_USCALED",
-      {1, 1, 128}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 32}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 32}, /* z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 32} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_W /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32_SNORM,
-      "PIPE_FORMAT_R32_SNORM",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_0, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32G32_SNORM,
-      "PIPE_FORMAT_R32G32_SNORM",
-      {1, 1, 64}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 32}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32G32B32_SNORM,
-      "PIPE_FORMAT_R32G32B32_SNORM",
-      {1, 1, 96}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 32}, /* y */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 32}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32G32B32A32_SNORM,
-      "PIPE_FORMAT_R32G32B32A32_SNORM",
-      {1, 1, 128}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 32}, /* y */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 32}, /* z */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 32} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_W /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32_SSCALED,
-      "PIPE_FORMAT_R32_SSCALED",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_0, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32G32_SSCALED,
-      "PIPE_FORMAT_R32G32_SSCALED",
-      {1, 1, 64}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 32}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32G32B32_SSCALED,
-      "PIPE_FORMAT_R32G32B32_SSCALED",
-      {1, 1, 96}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 32}, /* y */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 32}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32G32B32A32_SSCALED,
-      "PIPE_FORMAT_R32G32B32A32_SSCALED",
-      {1, 1, 128}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 32}, /* y */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 32}, /* z */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 32} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_W /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R16_UNORM,
-      "PIPE_FORMAT_R16_UNORM",
-      {1, 1, 16}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 16}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_0, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R16G16_UNORM,
-      "PIPE_FORMAT_R16G16_UNORM",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 16}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 16}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R16G16B16_UNORM,
-      "PIPE_FORMAT_R16G16B16_UNORM",
-      {1, 1, 48}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 16}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 16}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 16}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R16G16B16A16_UNORM,
-      "PIPE_FORMAT_R16G16B16A16_UNORM",
-      {1, 1, 64}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 16}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 16}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 16}, /* z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 16} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_W /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R16_USCALED,
-      "PIPE_FORMAT_R16_USCALED",
-      {1, 1, 16}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 16}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_0, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R16G16_USCALED,
-      "PIPE_FORMAT_R16G16_USCALED",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 16}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 16}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R16G16B16_USCALED,
-      "PIPE_FORMAT_R16G16B16_USCALED",
-      {1, 1, 48}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 16}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 16}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 16}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R16G16B16A16_USCALED,
-      "PIPE_FORMAT_R16G16B16A16_USCALED",
-      {1, 1, 64}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 16}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 16}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 16}, /* z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 16} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_W /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R16_SNORM,
-      "PIPE_FORMAT_R16_SNORM",
-      {1, 1, 16}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 16}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_0, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R16G16_SNORM,
-      "PIPE_FORMAT_R16G16_SNORM",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 16}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 16}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R16G16B16_SNORM,
-      "PIPE_FORMAT_R16G16B16_SNORM",
-      {1, 1, 48}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 16}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 16}, /* y */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 16}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R16G16B16A16_SNORM,
-      "PIPE_FORMAT_R16G16B16A16_SNORM",
-      {1, 1, 64}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 16}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 16}, /* y */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 16}, /* z */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 16} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_W /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R16_SSCALED,
-      "PIPE_FORMAT_R16_SSCALED",
-      {1, 1, 16}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 16}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_0, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R16G16_SSCALED,
-      "PIPE_FORMAT_R16G16_SSCALED",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 16}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 16}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R16G16B16_SSCALED,
-      "PIPE_FORMAT_R16G16B16_SSCALED",
-      {1, 1, 48}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 16}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 16}, /* y */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 16}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R16G16B16A16_SSCALED,
-      "PIPE_FORMAT_R16G16B16A16_SSCALED",
-      {1, 1, 64}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 16}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 16}, /* y */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 16}, /* z */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 16} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_W /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R8_UNORM,
-      "PIPE_FORMAT_R8_UNORM",
-      {1, 1, 8}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_0, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R8G8_UNORM,
-      "PIPE_FORMAT_R8G8_UNORM",
-      {1, 1, 16}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R8G8B8_UNORM,
-      "PIPE_FORMAT_R8G8B8_UNORM",
-      {1, 1, 24}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R8G8B8A8_UNORM,
-      "PIPE_FORMAT_R8G8B8A8_UNORM",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_W /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R8G8B8X8_UNORM,
-      "PIPE_FORMAT_R8G8B8X8_UNORM",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R8_USCALED,
-      "PIPE_FORMAT_R8_USCALED",
-      {1, 1, 8}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_0, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R8G8_USCALED,
-      "PIPE_FORMAT_R8G8_USCALED",
-      {1, 1, 16}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R8G8B8_USCALED,
-      "PIPE_FORMAT_R8G8B8_USCALED",
-      {1, 1, 24}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R8G8B8A8_USCALED,
-      "PIPE_FORMAT_R8G8B8A8_USCALED",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_W /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R8G8B8X8_USCALED,
-      "PIPE_FORMAT_R8G8B8X8_USCALED",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R8_SNORM,
-      "PIPE_FORMAT_R8_SNORM",
-      {1, 1, 8}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_0, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R8G8_SNORM,
-      "PIPE_FORMAT_R8G8_SNORM",
-      {1, 1, 16}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R8G8B8_SNORM,
-      "PIPE_FORMAT_R8G8B8_SNORM",
-      {1, 1, 24}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R8G8B8A8_SNORM,
-      "PIPE_FORMAT_R8G8B8A8_SNORM",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_W /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R8G8B8X8_SNORM,
-      "PIPE_FORMAT_R8G8B8X8_SNORM",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_B6G5R5_SNORM,
-      "PIPE_FORMAT_B6G5R5_SNORM",
-      {1, 1, 16}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 5}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 5}, /* y */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 6}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_Z, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_X, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_A8B8G8R8_SNORM,
-      "PIPE_FORMAT_A8B8G8R8_SNORM",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_Z, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_X, /* b */
-         UTIL_FORMAT_SWIZZLE_W /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_X8B8G8R8_SNORM,
-      "PIPE_FORMAT_X8B8G8R8_SNORM",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_Z, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_X, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R8_SSCALED,
-      "PIPE_FORMAT_R8_SSCALED",
-      {1, 1, 8}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_0, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R8G8_SSCALED,
-      "PIPE_FORMAT_R8G8_SSCALED",
-      {1, 1, 16}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R8G8B8_SSCALED,
-      "PIPE_FORMAT_R8G8B8_SSCALED",
-      {1, 1, 24}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R8G8B8A8_SSCALED,
-      "PIPE_FORMAT_R8G8B8A8_SSCALED",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 8} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_W /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R8G8B8X8_SSCALED,
-      "PIPE_FORMAT_R8G8B8X8_SSCALED",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_SIGNED, FALSE, 8} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32_FIXED,
-      "PIPE_FORMAT_R32_FIXED",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_FIXED, FALSE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_0, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32G32_FIXED,
-      "PIPE_FORMAT_R32G32_FIXED",
-      {1, 1, 64}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_FIXED, FALSE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_FIXED, FALSE, 32}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_0, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32G32B32_FIXED,
-      "PIPE_FORMAT_R32G32B32_FIXED",
-      {1, 1, 96}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_FIXED, FALSE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_FIXED, FALSE, 32}, /* y */
-         {UTIL_FORMAT_TYPE_FIXED, FALSE, 32}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R32G32B32A32_FIXED,
-      "PIPE_FORMAT_R32G32B32A32_FIXED",
-      {1, 1, 128}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_FIXED, FALSE, 32}, /* x */
-         {UTIL_FORMAT_TYPE_FIXED, FALSE, 32}, /* y */
-         {UTIL_FORMAT_TYPE_FIXED, FALSE, 32}, /* z */
-         {UTIL_FORMAT_TYPE_FIXED, FALSE, 32} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_W /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_L8_SRGB,
-      "PIPE_FORMAT_L8_SRGB",
-      {1, 1, 8}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_X, /* g */
-         UTIL_FORMAT_SWIZZLE_X, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_A8L8_SRGB,
-      "PIPE_FORMAT_A8L8_SRGB",
-      {1, 1, 16}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_X, /* g */
-         UTIL_FORMAT_SWIZZLE_X, /* b */
-         UTIL_FORMAT_SWIZZLE_Y /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R8G8B8_SRGB,
-      "PIPE_FORMAT_R8G8B8_SRGB",
-      {1, 1, 24}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R8G8B8A8_SRGB,
-      "PIPE_FORMAT_R8G8B8A8_SRGB",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_W /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_R8G8B8X8_SRGB,
-      "PIPE_FORMAT_R8G8B8X8_SRGB",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_A8R8G8B8_SRGB,
-      "PIPE_FORMAT_A8R8G8B8_SRGB",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_W, /* r */
-         UTIL_FORMAT_SWIZZLE_X, /* g */
-         UTIL_FORMAT_SWIZZLE_Y, /* b */
-         UTIL_FORMAT_SWIZZLE_Z /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_X8R8G8B8_SRGB,
-      "PIPE_FORMAT_X8R8G8B8_SRGB",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_1, /* r */
-         UTIL_FORMAT_SWIZZLE_X, /* g */
-         UTIL_FORMAT_SWIZZLE_Y, /* b */
-         UTIL_FORMAT_SWIZZLE_Z /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_B8G8R8A8_SRGB,
-      "PIPE_FORMAT_B8G8R8A8_SRGB",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_Z, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_X, /* b */
-         UTIL_FORMAT_SWIZZLE_W /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_B8G8R8X8_SRGB,
-      "PIPE_FORMAT_B8G8R8X8_SRGB",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_UNSIGNED, FALSE, 8} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_Z, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_X, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_X8UB8UG8SR8S_NORM,
-      "PIPE_FORMAT_X8UB8UG8SR8S_NORM",
-      {1, 1, 32}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 8}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 8}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 8} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_1, /* r */
-         UTIL_FORMAT_SWIZZLE_Z, /* g */
-         UTIL_FORMAT_SWIZZLE_Y, /* b */
-         UTIL_FORMAT_SWIZZLE_X /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_B6UG5SR5S_NORM,
-      "PIPE_FORMAT_B6UG5SR5S_NORM",
-      {1, 1, 16}, /* block */
-      UTIL_FORMAT_LAYOUT_RGBA,
-      {
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 5}, /* x */
-         {UTIL_FORMAT_TYPE_SIGNED, TRUE, 5}, /* y */
-         {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 6}, /* z */
-         {UTIL_FORMAT_TYPE_VOID, FALSE, 0} /* w */
-      },
-      {
-         UTIL_FORMAT_SWIZZLE_X, /* r */
-         UTIL_FORMAT_SWIZZLE_Y, /* g */
-         UTIL_FORMAT_SWIZZLE_Z, /* b */
-         UTIL_FORMAT_SWIZZLE_1 /* a */
-      },
-      UTIL_FORMAT_COLORSPACE_RGB,
-   },
-   {
-      PIPE_FORMAT_NONE,
-      "PIPE_FORMAT_NONE",
-      {0, 0, 0},
-      0,
-      {{0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}},
-      {0, 0, 0, 0},
-      0
-   },
-};