mesa: Change many Type A MESA_FORMATs to meet naming standard

Update comments. Conversion of the following Type A formats:
    s/MESA_FORMAT_RGB888\b/MESA_FORMAT_BGR_UNORM8/g
    s/MESA_FORMAT_BGR888\b/MESA_FORMAT_RGB_UNORM8/g
    s/MESA_FORMAT_A8\b/MESA_FORMAT_A_UNORM8/g
    s/MESA_FORMAT_A16\b/MESA_FORMAT_A_UNORM16/g
    s/MESA_FORMAT_L8\b/MESA_FORMAT_L_UNORM8/g
    s/MESA_FORMAT_L16\b/MESA_FORMAT_L_UNORM16/g
    s/MESA_FORMAT_I8\b/MESA_FORMAT_I_UNORM8/g
    s/MESA_FORMAT_I16\b/MESA_FORMAT_I_UNORM16/g
    s/MESA_FORMAT_R8\b/MESA_FORMAT_R_UNORM8/g
    s/MESA_FORMAT_R16\b/MESA_FORMAT_R_UNORM16/g
    s/MESA_FORMAT_Z16\b/MESA_FORMAT_Z_UNORM16/g
    s/MESA_FORMAT_Z32\b/MESA_FORMAT_Z_UNORM32/g
    s/MESA_FORMAT_S8\b/MESA_FORMAT_S_UINT8/g
    s/MESA_FORMAT_SRGB8\b/MESA_FORMAT_BGR_SRGB8/g
    s/MESA_FORMAT_RGBA_16\b/MESA_FORMAT_RGBA_UNORM16/g
    s/MESA_FORMAT_SL8\b/MESA_FORMAT_L_SRGB8/g
    s/MESA_FORMAT_Z32_FLOAT\b/MESA_FORMAT_Z_FLOAT32/g
    s/MESA_FORMAT_XBGR16161616_UNORM\b/MESA_FORMAT_RGBX_UNORM16/g
    s/MESA_FORMAT_XBGR16161616_SNORM\b/MESA_FORMAT_RGBX_SNORM16/g
    s/MESA_FORMAT_XBGR16161616_FLOAT\b/MESA_FORMAT_RGBX_FLOAT16/g
    s/MESA_FORMAT_XBGR16161616_UINT\b/MESA_FORMAT_RGBX_UINT16/g
    s/MESA_FORMAT_XBGR16161616_SINT\b/MESA_FORMAT_RGBX_SINT16/g
    s/MESA_FORMAT_XBGR32323232_FLOAT\b/MESA_FORMAT_RGBX_FLOAT32/g
    s/MESA_FORMAT_XBGR32323232_UINT\b/MESA_FORMAT_RGBX_UINT32/g
    s/MESA_FORMAT_XBGR32323232_SINT\b/MESA_FORMAT_RGBX_SINT32/g
    s/MESA_FORMAT_XBGR8888_UINT\b/MESA_FORMAT_RGBX_UINT8/g
    s/MESA_FORMAT_XBGR8888_SINT\b/MESA_FORMAT_RGBX_SINT8/g

1 files changed, 365 insertions, 32 deletions

diff --git a/src/mesa/main/formats.h b/src/mesa/main/formats.h
index 1e8ffb451b3..1e3fb8d43f5 100644
--- a/src/mesa/main/formats.h
+++ b/src/mesa/main/formats.h
@@ -61,11 +61,278 @@ typedef enum
 {
    MESA_FORMAT_NONE = 0,
 
-   /** 
+   /**
     * \name Basic hardware formats
+    *
+    * The mesa format name specification is as follows:
+    *
+    *  There shall be 3 naming format base types: those for component array
+    *  formats (type A); those for compressed formats (type C); and those for packed
+    *  component formats (type P). With type A formats, color component order does not
+    *  change with endianess. Each format name shall begin with MESA_FORMAT_,
+    *  followed by a component label (from the Component Label list below) for each
+    *  component in the order that the component(s) occur in the format, except for
+    *  non-linear color formats where the first letter shall be 'S'. For type P formats,
+    *  each component label is followed by the number of bits that represent it in the
+    *  fundamental data type used by the format.
+    *
+    *  Following the listing of the component labels shall be an underscore; a compression
+    *  type followed by an underscore for Type C formats only; a storage type from the list
+    *  below; and a bit with for type A formats, which is the bit width for each array element.
+    *
+    *
+    *  ----------    Format Base Type A: Array ----------
+    *  MESA_FORMAT_[component list]_[storage type][array element bit width]
+    *
+    *  examples:
+    *  MESA_FORMAT_A_SNORM8     - uchar[i] = A
+    *  MESA_FORMAT_RGBA_16 - ushort[i * 4 + 0] = R, ushort[i * 4 + 1] = G,
+    *                             ushort[i * 4 + 2] = B, ushort[i * 4 + 3] = A
+    *  MESA_FORMAT_Z_UNORM32    - float[i] = Z
+    *
+    *
+    *
+    *  ----------    Format Base Type C: Compressed ----------
+    *  MESA_FORMAT_[component list*][_*][compression type][storage type*]
+    *  * where required
+    *
+    *  examples:
+    *  MESA_FORMAT_RGB_ETC1
+    *  MESA_FORMAT_RGBA_ETC2
+    *  MESA_FORMAT_LATC1_UNORM
+    *  MESA_FORMAT_RGBA_FXT1
+    *
+    *
+    *
+    *  ----------    Format Base Type P: Packed  ----------
+    *  MESA_FORMAT_[[component list,bit width][storage type*][_]][_][storage type**]
+    *   * when type differs between component
+    *   ** when type applies to all components
+    *
+    *  examples:                   msb <------ TEXEL BITS -----------> lsb
+    *  MESA_FORMAT_A8B8G8R8_UNORM, AAAA AAAA BBBB BBBB GGGG GGGG RRRR RRRR
+    *  MESA_FORMAT_R5G6B5_UNORM                        RRRR RGGG GGGB BBBB
+    *  MESA_FORMAT_B4G4R4X4_UNORM                      BBBB GGGG RRRR XXXX
+    *  MESA_FORMAT_Z32_FLOAT_S8X24_UINT
+    *  MESA_FORMAT_R10G10B10A2_UINT
+    *  MESA_FORMAT_R9G9B9E5_FLOAT
+    *
+    *
+    *
+    *  ----------    Component Labels: ----------
+    *  A - Alpha
+    *  B - Blue
+    *  DU - Delta U
+    *  DV - Delta V
+    *  E - Shared Exponent
+    *  G - Green
+    *  I - Intensity
+    *  L - Luminance
+    *  R - Red
+    *  S - Stencil (when not followed by RGB or RGBA)
+    *  U - Chrominance
+    *  V - Chrominance
+    *  Y - Luma
+    *  X - Packing bits
+    *  Z - Depth
+    *
+    *
+    *
+    *  ----------    Type C Compression Types: ----------
+    *  DXT1 - Color component labels shall be given
+    *  DXT3 - Color component labels shall be given
+    *  DXT5 - Color component labels shall be given
+    *  ETC1 - No other information required
+    *  ETC2 - No other information required
+    *  FXT1 - Color component labels shall be given
+    *  FXT3 - Color component labels shall be given
+    *  LATC1 - Fundamental data type shall be given
+    *  LATC2 - Fundamental data type shall be given
+    *  RGTC1 - Color component labels and data type shall be given
+    *  RGTC2 - Color component labels and data type shall be given
+    *
+    *
+    *
+    *  ----------    Storage Types: ----------
+    *  FLOAT
+    *  SINT
+    *  UINT
+    *  SNORM
+    *  UNORM
+    *  SRGB - RGB components, or L are UNORMs in sRGB color space. Alpha, if present is linear.
+    *
+    *
+    *   ----------   Type A Format List (based on format_unpack.c):
+    *  BGR_UNORM8
+    *  RGB_UNORM8
+    *  A_UNORM8
+    *  A_UNORM16
+    *  L_UNORM8
+    *  L_UNORM16
+    *  I_UNORM8
+    *  I_UNOMR16
+    *  R_UNORM8
+    *  R_UNORM16
+    *  Z_UNORM16
+    *  Z_UNORM32
+    *  Z_FLOAT32
+    *  S_UINT8
+    *  BGR_SRGB8
+    *  L_SRGB8
+    *  RGBA_FLOAT32
+    *  RGBA_FLOAT16
+    *  RGB_FLOAT32
+    *  RGB_FLOAT16
+    *  A_FLOAT32
+    *  A_FLOAT16
+    *  L_FLOAT32
+    *  L_FLOAT16
+    *  LA_FLOAT32
+    *  LA_FLOAT16
+    *  I_FLOAT32
+    *  I_FLOAT16
+    *  R_FLOAT32
+    *  R_FLOAT16
+    *  RG_FLOAT32
+    *  RG_FLOAT16
+    *  A_UINT8
+    *  A_UINT16
+    *  A_UINT32
+    *  A_SINT8
+    *  A_SINT16
+    *  A_SINT32
+    *  I_UINT8
+    *  I_UINT16
+    *  I_UINT32
+    *  I_SINT8
+    *  I_SINT16
+    *  I_SINT32
+    *  L_UINT8
+    *  L_UINT16
+    *  L_UINT32
+    *  L_SINT8
+    *  L_SINT16
+    *  L_SINT32
+    *  LA_UINT8
+    *  LA_UINT16
+    *  LA_UINT32
+    *  LA_SINT8
+    *  LA_SINT16
+    *  LA_SINT32
+    *  R_SINT8
+    *  RG_SINT8
+    *  RGB_SINT8
+    *  RGBA_SINT8
+    *  R_SINT16
+    *  RG_SINT16
+    *  RGB_SINT16
+    *  RGBA_SINT16
+    *  R_SINT32
+    *  RG_SINT32
+    *  RGB_SINT32
+    *  RGBA_SINT32
+    *  R_SINT16
+    *  R_SINT32
+    *  R_UINT8
+    *  RG_UINT8
+    *  RGB_UINT8
+    *  RGBA_UINT8
+    *  R_UINT16
+    *  RG_UINT16
+    *  RGB_UINT16
+    *  RGBA_UINT16
+    *  R_UINT32
+    *  RG_UINT32
+    *  RGB_UINT32
+    *  RGBA_UINT32
+    *  R_UINT16
+    *  R_UINT32
+    *  R_SNORM8
+    *  R_SNORM16
+    *  RGB_SNORM16
+    *  RGBA_SNORM16
+    *  RGBA_UNORM16
+    *  A_SNORM8
+    *  L_SNORM8
+    *  I_SNORM8
+    *  A_SNORM16
+    *  L_SNORM16
+    *  LA_SNORM16
+    *  I_SNORM16
+    *  RGBX_UINT8
+    *  RGBX_SINT8
+    *  RGBX_UNORM16
+    *  RGBX_SNORM16
+    *  RGBX_FLOAT16
+    *  RGBX_UINT16
+    *  RGBX_SINT16
+    *  RGBX_FLOAT32
+    *  RGBX_UINT32
+    *  RGBX_SINT32
+    *
+    *
+    *
+    *   ----------   Type P Format List (based on format_unpack.c):
+    *  A8B8G8R8_UNORM
+    *  R8G8B8A8_UNORM
+    *  B8G8R8A8_UNORM
+    *  A8R8G8B8_UNORM
+    *  X8B8G8R8_UNORM
+    *  R8G8B8X8_UNORM
+    *  B8G8R8X8_UNORM
+    *  X8R8G8B8_UNORM
+    *  B5G6R5_UNORM
+    *  R5G6B5_UNORM
+    *  B4G4R4A4_UNORM
+    *  A4R4G4B4_UNORM
+    *  A1B5G5R5_UNORM
+    *  B5G5R5A1_UNORM
+    *  A1R5G5B5_UNORM
+    *  L4A4_UNORM
+    *  L8A8_UNORM
+    *  A8L8_UNORM
+    *  L16A16_UNORM
+    *  A16L16_UNORM
+    *  B2G3R3_UNORM
+    *  YCBCR
+    *  YCBCR_REV
+    *  R8G8_UNORM
+    *  G8R8_UNORM
+    *  R16G16_UNORM
+    *  G16R16_UNORM
+    *  B10G10R10A2_UNORM
+    *  B10G10R10A2_UINT
+    *  R10G10B10A2_UINT
+    *  S8_UINT_Z24_UNORM
+    *  Z24_UNORM_S8_UINT
+    *  Z24_UNORM_X8_UINT
+    *  X8_UINT_Z24_UNORM
+    *  Z32_FLOAT_S8X24_UINT
+    *  A8R8G8B8_SRGB
+    *  B8G8R8A8_SRGB
+    *  L8A8_SRGB
+    *  R8G8_SNORM
+    *  X8B8G8R8_SNORM
+    *  A8B8G8R8_SNORM
+    *  R8G8B8A8_SNORM
+    *  R16G16_SNORM
+    *  L8A8_SNORM
+    *  R9G9B9E5_FLOAT
+    *  R11G11B10_FLOAT
+    *  B4G4R4X4_UNORM
+    *  B5G5R5X1_UNORM
+    *  R8G8_SNORM
+    *  R8G8B8X8_SNORM
+    *  R8G8B8X8_SRGB
+    *  B10G10R10X2_UNORM
+    *  R10G10B10A2_UNORM
+    *  G8R8_SINT
+    *  G16R16_SINT
+    *
     */
    /*@{*/
-                                 /* msb <------ TEXEL BITS -----------> lsb */
+
+   /* Type P formats */          /* msb <------ TEXEL BITS -----------> lsb */
                                  /* ---- ---- ---- ---- ---- ---- ---- ---- */
    MESA_FORMAT_A8B8G8R8_UNORM,   /* AAAA AAAA BBBB BBBB GGGG GGGG RRRR RRRR */
    MESA_FORMAT_R8G8B8A8_UNORM,   /* RRRR RRRR GGGG GGGG BBBB BBBB AAAA AAAA */
@@ -75,8 +342,12 @@ typedef enum
    MESA_FORMAT_R8G8B8X8_UNORM,   /* RRRR RRRR GGGG GGGG BBBB BBBB xxxx xxxx */
    MESA_FORMAT_B8G8R8X8_UNORM,   /* BBBB BBBB GGGG GGGG RRRR RRRR xxxx xxxx */
    MESA_FORMAT_X8R8G8B8_UNORM,   /* xxxx xxxx RRRR RRRR GGGG GGGG BBBB BBBB */
-   MESA_FORMAT_RGB888,		/*           RRRR RRRR GGGG GGGG BBBB BBBB */
-   MESA_FORMAT_BGR888,		/*           BBBB BBBB GGGG GGGG RRRR RRRR */
+
+   /* Type A formats */
+   MESA_FORMAT_BGR_UNORM8,    /* uchar[i * 3] = B, [i * 3 + 1] = G, [i *3 + 2] = R */
+   MESA_FORMAT_RGB_UNORM8,    /* uchar[i * 3] = R, [i * 3 + 1] = G, [i *3 + 2] = B */
+
+   /* Type P formats */
    MESA_FORMAT_RGB565,		/*                     RRRR RGGG GGGB BBBB */
    MESA_FORMAT_RGB565_REV,	/*                     GGGB BBBB RRRR RGGG */
    MESA_FORMAT_ARGB4444,	/*                     AAAA RRRR GGGG BBBB */
@@ -90,39 +361,66 @@ typedef enum
    MESA_FORMAT_AL1616,          /* AAAA AAAA AAAA AAAA LLLL LLLL LLLL LLLL */
    MESA_FORMAT_AL1616_REV,      /* LLLL LLLL LLLL LLLL AAAA AAAA AAAA AAAA */
    MESA_FORMAT_RGB332,		/*                               RRRG GGBB */
-   MESA_FORMAT_A8,		/*                               AAAA AAAA */
-   MESA_FORMAT_A16,             /*                     AAAA AAAA AAAA AAAA */
-   MESA_FORMAT_L8,		/*                               LLLL LLLL */
-   MESA_FORMAT_L16,             /*                     LLLL LLLL LLLL LLLL */
-   MESA_FORMAT_I8,		/*                               IIII IIII */
-   MESA_FORMAT_I16,             /*                     IIII IIII IIII IIII */
+
+   /* Type A formats */
+   MESA_FORMAT_A_UNORM8,     /* uchar[i] = A */
+   MESA_FORMAT_A_UNORM16,    /* ushort[i] = A */
+   MESA_FORMAT_L_UNORM8,     /* uchar[i] = L */
+   MESA_FORMAT_L_UNORM16,    /* ushort[i] = L */
+   MESA_FORMAT_I_UNORM8,     /* uchar[i] = I */
+   MESA_FORMAT_I_UNORM16,    /* ushort[i] = I */
+
+   /* Type P formats */
    MESA_FORMAT_YCBCR,		/*                     YYYY YYYY UorV UorV */
    MESA_FORMAT_YCBCR_REV,	/*                     UorV UorV YYYY YYYY */
-   MESA_FORMAT_R8,		/*                               RRRR RRRR */
+
+   /* Type A format(s) */
+   MESA_FORMAT_R_UNORM8,      /* uchar[i] = R */
+
+   /* Type P formats */
    MESA_FORMAT_GR88,		/*                     GGGG GGGG RRRR RRRR */
    MESA_FORMAT_RG88,    	/*                     RRRR RRRR GGGG GGGG */
-   MESA_FORMAT_R16,		/*                     RRRR RRRR RRRR RRRR */
+
+   /* Type A format(s) */
+   MESA_FORMAT_R_UNORM16,     /* ushort[i] = R */
+
+   /* Type P formats */
    MESA_FORMAT_GR1616,		/* GGGG GGGG GGGG GGGG RRRR RRRR RRRR RRRR */
    MESA_FORMAT_RG1616,          /* RRRR RRRR RRRR RRRR GGGG GGGG GGGG GGGG */
    MESA_FORMAT_ARGB2101010,     /* AARR RRRR RRRR GGGG GGGG GGBB BBBB BBBB */
    MESA_FORMAT_Z24_S8,          /* ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ SSSS SSSS */
    MESA_FORMAT_S8_Z24,          /* SSSS SSSS ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ */
-   MESA_FORMAT_Z16,             /*                     ZZZZ ZZZZ ZZZZ ZZZZ */
+
+   /* Type A format(s) */
+   MESA_FORMAT_Z_UNORM16,     /* ushort[i] = Z */
+
+   /* Type P formats */
    MESA_FORMAT_X8_Z24,          /* xxxx xxxx ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ */
    MESA_FORMAT_Z24_X8,          /* ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ xxxx xxxx */
-   MESA_FORMAT_Z32,             /* ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ */
-   MESA_FORMAT_S8,              /*                               SSSS SSSS */
+
+   /* Type A formats */
+   MESA_FORMAT_Z_UNORM32,     /* uint[i] = Z */
+   MESA_FORMAT_S_UINT8,       /* uchar[i] = S */
    /*@}*/
 
    /**
     * \name 8-bit/channel sRGB formats
     */
    /*@{*/
-   MESA_FORMAT_SRGB8,           /*           RRRR RRRR GGGG GGGG BBBB BBBB */
+   /* Type A format(s) */
+   MESA_FORMAT_BGR_SRGB8,     /* uchar[i * 3] = B, [i * 3 + 1] = G, [i *3 + 2] = R */
+
+   /* Type P formats */
    MESA_FORMAT_SRGBA8,          /* RRRR RRRR GGGG GGGG BBBB BBBB AAAA AAAA */
    MESA_FORMAT_SARGB8,          /* AAAA AAAA RRRR RRRR GGGG GGGG BBBB BBBB */
-   MESA_FORMAT_SL8,             /*                               LLLL LLLL */
+
+   /* Type A format(s) */
+   MESA_FORMAT_L_SRGB8,       /* uchar[i] = L */
+
+   /* Type P formats */
    MESA_FORMAT_SLA8,            /*                     AAAA AAAA LLLL LLLL */
+
+   /* Type C formats */
    MESA_FORMAT_SRGB_DXT1,
    MESA_FORMAT_SRGBA_DXT1,
    MESA_FORMAT_SRGBA_DXT3,
@@ -133,6 +431,7 @@ typedef enum
     * \name Compressed texture formats.
     */
    /*@{*/
+   /* Type C formats */
    MESA_FORMAT_RGB_FXT1,
    MESA_FORMAT_RGBA_FXT1,
    MESA_FORMAT_RGB_DXT1,
@@ -145,7 +444,9 @@ typedef enum
     * \name Floating point texture formats.
     */
    /*@{*/
-   MESA_FORMAT_RGBA_FLOAT32,
+
+   /* Type A formats */
+   MESA_FORMAT_RGBA_FLOAT32,  /* float[i * 4] = R, [i * 4 + 1] = G, [i * 4 + 2] = B, [i * 4 + 3] = A */
    MESA_FORMAT_RGBA_FLOAT16,
    MESA_FORMAT_RGB_FLOAT32,
    MESA_FORMAT_RGB_FLOAT16,
@@ -168,6 +469,8 @@ typedef enum
     * XXX Note: these are just stand-ins for some better hardware
     * formats TBD such as BGRA or ARGB.
     */
+
+   /* Type A formats */
    MESA_FORMAT_ALPHA_UINT8,
    MESA_FORMAT_ALPHA_UINT16,
    MESA_FORMAT_ALPHA_UINT32,
@@ -188,7 +491,6 @@ typedef enum
    MESA_FORMAT_LUMINANCE_INT8,
    MESA_FORMAT_LUMINANCE_INT16,
    MESA_FORMAT_LUMINANCE_INT32,
-
    MESA_FORMAT_LUMINANCE_ALPHA_UINT8,
    MESA_FORMAT_LUMINANCE_ALPHA_UINT16,
    MESA_FORMAT_LUMINANCE_ALPHA_UINT32,
@@ -204,6 +506,7 @@ typedef enum
    MESA_FORMAT_RG_INT16,
    MESA_FORMAT_RGB_INT16,
    MESA_FORMAT_RGBA_INT16,
+
    MESA_FORMAT_R_INT32,
    MESA_FORMAT_RG_INT32,
    MESA_FORMAT_RGB_INT32,
@@ -212,14 +515,17 @@ typedef enum
    /**
     * \name Non-normalized unsigned integer formats.
     */
+   /* Type A format(s) */
    MESA_FORMAT_R_UINT8,
    MESA_FORMAT_RG_UINT8,
    MESA_FORMAT_RGB_UINT8,
    MESA_FORMAT_RGBA_UINT8,
+
    MESA_FORMAT_R_UINT16,
    MESA_FORMAT_RG_UINT16,
    MESA_FORMAT_RGB_UINT16,
    MESA_FORMAT_RGBA_UINT16,
+
    MESA_FORMAT_R_UINT32,
    MESA_FORMAT_RG_UINT32,
    MESA_FORMAT_RGB_UINT32,
@@ -232,19 +538,30 @@ typedef enum
     */
    /*@{*/
    MESA_FORMAT_DUDV8,             /*                     DUDU DUDU DVDV DVDV */
+
+   /* Type A format(s) */
    MESA_FORMAT_SIGNED_R8,         /*                               RRRR RRRR */
+
+   /* Type P formats */
    MESA_FORMAT_SIGNED_RG88_REV,   /*                     GGGG GGGG RRRR RRRR */
    MESA_FORMAT_SIGNED_RGBX8888,   /* RRRR RRRR GGGG GGGG BBBB BBBB xxxx xxxx */
    MESA_FORMAT_SIGNED_RGBA8888,   /* RRRR RRRR GGGG GGGG BBBB BBBB AAAA AAAA */
    MESA_FORMAT_SIGNED_RGBA8888_REV,/*AAAA AAAA BBBB BBBB GGGG GGGG RRRR RRRR */
+
+   /* Type A format(s) */
    MESA_FORMAT_SIGNED_R16,        /*                     RRRR RRRR RRRR RRRR */
+
+   /* Type P format(s) */
    MESA_FORMAT_SIGNED_GR1616,     /* GGGG GGGG GGGG GGGG RRRR RRRR RRRR RRRR */
+
+   /* Type A format(s) */
    MESA_FORMAT_SIGNED_RGB_16,     /* ushort[0]=R, ushort[1]=G, ushort[2]=B */
    MESA_FORMAT_SIGNED_RGBA_16,    /* ... */
-   MESA_FORMAT_RGBA_16,           /* ... */
+   MESA_FORMAT_RGBA_UNORM16,      /* ... */
    /*@}*/
 
    /*@{*/
+   /* Type C formats */
    MESA_FORMAT_RED_RGTC1,
    MESA_FORMAT_SIGNED_RED_RGTC1,
    MESA_FORMAT_RG_RGTC2,
@@ -270,19 +587,28 @@ typedef enum
    MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1,
    MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1,
 
+   /* Type A format(s) */
    MESA_FORMAT_SIGNED_A8,         /*                               AAAA AAAA */
    MESA_FORMAT_SIGNED_L8,         /*                               LLLL LLLL */
+
+   /* Type P format(s) */
    MESA_FORMAT_SIGNED_AL88,       /*                     AAAA AAAA LLLL LLLL */
+
+   /* Type A format(s) */
    MESA_FORMAT_SIGNED_I8,         /*                               IIII IIII */
    MESA_FORMAT_SIGNED_A16,        /*                     AAAA AAAA AAAA AAAA */
    MESA_FORMAT_SIGNED_L16,        /*                     LLLL LLLL LLLL LLLL */
    MESA_FORMAT_SIGNED_AL1616,     /* AAAA AAAA AAAA AAAA LLLL LLLL LLLL LLLL */
    MESA_FORMAT_SIGNED_I16,        /*                     IIII IIII IIII IIII */
 
+   /* Type P format(s) */
    MESA_FORMAT_RGB9_E5_FLOAT,
    MESA_FORMAT_R11_G11_B10_FLOAT,
 
-   MESA_FORMAT_Z32_FLOAT,
+   /* Type A format(s) */
+   MESA_FORMAT_Z_FLOAT32,
+
+   /* Type P formats */
    MESA_FORMAT_Z32_FLOAT_X24S8,
 
    MESA_FORMAT_ARGB2101010_UINT,
@@ -292,20 +618,27 @@ typedef enum
    MESA_FORMAT_XRGB1555_UNORM,    /*                     xRRR RRGG GGGB BBBB */
    MESA_FORMAT_XBGR8888_SNORM,    /* xxxx xxxx BBBB BBBB GGGG GGGG RRRR RRRR */
    MESA_FORMAT_XBGR8888_SRGB,     /* xxxx xxxx BBBB BBBB GGGG GGGG RRRR RRRR */
-   MESA_FORMAT_XBGR8888_UINT,     /* xxxx xxxx BBBB BBBB GGGG GGGG RRRR RRRR */
-   MESA_FORMAT_XBGR8888_SINT,     /* xxxx xxxx BBBB BBBB GGGG GGGG RRRR RRRR */
+
+   /* Type A formats */
+   MESA_FORMAT_RGBX_UINT8,    /* uchar[i * 4] = R, [i * 4 + 1] = G, [i * 4 + 2] = B, [i * 4 + 3] = x */
+   MESA_FORMAT_RGBX_SINT8,    /* char[i * 4] = R, [i * 4 + 1] = G, [i * 4 + 2] = B, [i * 4 + 3] = x  */
+
+   /* Type P format(s) */
    MESA_FORMAT_XRGB2101010_UNORM, /* xxRR RRRR RRRR GGGG GGGG GGBB BBBB BBBB */
-   MESA_FORMAT_XBGR16161616_UNORM,/* ushort[3]=x, [2]=B, [1]=G, [0]=R */
-   MESA_FORMAT_XBGR16161616_SNORM,/* ... */
-   MESA_FORMAT_XBGR16161616_FLOAT,/* ... */
-   MESA_FORMAT_XBGR16161616_UINT, /* ... */
-   MESA_FORMAT_XBGR16161616_SINT, /* ... */
-   MESA_FORMAT_XBGR32323232_FLOAT,/* float[3]=x, [2]=B, [1]=G, [0]=R */
-   MESA_FORMAT_XBGR32323232_UINT, /* ... */
-   MESA_FORMAT_XBGR32323232_SINT, /* ... */
 
-   MESA_FORMAT_ABGR2101010,
+   /* Type A format(s) */
+   MESA_FORMAT_RGBX_UNORM16,  /* ushort[i * 4] = R, [i * 4 + 1] = G, [i * 4 + 2] = B, [i * 4 + 3] = x */
+   MESA_FORMAT_RGBX_SNORM16,  /* ... */
+   MESA_FORMAT_RGBX_FLOAT16,  /* ... */
+   MESA_FORMAT_RGBX_UINT16,   /* ... */
+   MESA_FORMAT_RGBX_SINT16,   /* ... */
 
+   MESA_FORMAT_RGBX_FLOAT32,  /* float[i * 4] = R, [i * 4 + 1] = G, [i * 4 + 2] = B, [i * 4 + 3] = x */
+   MESA_FORMAT_RGBX_UINT32,   /* ... */
+   MESA_FORMAT_RGBX_SINT32,   /* ... */
+
+   /* Type P formats */
+   MESA_FORMAT_ABGR2101010,
    MESA_FORMAT_SIGNED_RG88,
    MESA_FORMAT_SIGNED_RG1616,