gallium: Remove manual defining of PIPE_FORMAT enum values.

Now that SVGA doesn't have a table that has to be in PIPE_FORMAT
order, we can let the enums have whatever values they naturally would
without worrying about holes.

Acked-by: Jose Fonseca <[email protected]>
Reviewed-by: Charmaine Lee <[email protected]>

1 files changed, 357 insertions, 357 deletions

diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h
index 973442e608f..f4a17247db7 100644
--- a/src/gallium/include/pipe/p_format.h
+++ b/src/gallium/include/pipe/p_format.h
@@ -39,378 +39,378 @@ extern "C" {
  * Formats for textures, surfaces and vertex data
  */
 enum pipe_format {
-   PIPE_FORMAT_NONE                    = 0,
-   PIPE_FORMAT_B8G8R8A8_UNORM          = 1,
-   PIPE_FORMAT_B8G8R8X8_UNORM          = 2,
-   PIPE_FORMAT_A8R8G8B8_UNORM          = 3,
-   PIPE_FORMAT_X8R8G8B8_UNORM          = 4,
-   PIPE_FORMAT_B5G5R5A1_UNORM          = 5,
-   PIPE_FORMAT_B4G4R4A4_UNORM          = 6,
-   PIPE_FORMAT_B5G6R5_UNORM            = 7,
-   PIPE_FORMAT_R10G10B10A2_UNORM       = 8,
-   PIPE_FORMAT_L8_UNORM                = 9,    /**< ubyte luminance */
-   PIPE_FORMAT_A8_UNORM                = 10,   /**< ubyte alpha */
-   PIPE_FORMAT_I8_UNORM                = 11,   /**< ubyte intensity */
-   PIPE_FORMAT_L8A8_UNORM              = 12,   /**< ubyte alpha, luminance */
-   PIPE_FORMAT_L16_UNORM               = 13,   /**< ushort luminance */
-   PIPE_FORMAT_UYVY                    = 14,
-   PIPE_FORMAT_YUYV                    = 15,
-   PIPE_FORMAT_Z16_UNORM               = 16,
-   PIPE_FORMAT_Z32_UNORM               = 17,
-   PIPE_FORMAT_Z32_FLOAT               = 18,
-   PIPE_FORMAT_Z24_UNORM_S8_UINT       = 19,
-   PIPE_FORMAT_S8_UINT_Z24_UNORM       = 20,
-   PIPE_FORMAT_Z24X8_UNORM             = 21,
-   PIPE_FORMAT_X8Z24_UNORM             = 22,
-   PIPE_FORMAT_S8_UINT                 = 23,   /**< ubyte stencil */
-   PIPE_FORMAT_R64_FLOAT               = 24,
-   PIPE_FORMAT_R64G64_FLOAT            = 25,
-   PIPE_FORMAT_R64G64B64_FLOAT         = 26,
-   PIPE_FORMAT_R64G64B64A64_FLOAT      = 27,
-   PIPE_FORMAT_R32_FLOAT               = 28,
-   PIPE_FORMAT_R32G32_FLOAT            = 29,
-   PIPE_FORMAT_R32G32B32_FLOAT         = 30,
-   PIPE_FORMAT_R32G32B32A32_FLOAT      = 31,
-   PIPE_FORMAT_R32_UNORM               = 32,
-   PIPE_FORMAT_R32G32_UNORM            = 33,
-   PIPE_FORMAT_R32G32B32_UNORM         = 34,
-   PIPE_FORMAT_R32G32B32A32_UNORM      = 35,
-   PIPE_FORMAT_R32_USCALED             = 36,
-   PIPE_FORMAT_R32G32_USCALED          = 37,
-   PIPE_FORMAT_R32G32B32_USCALED       = 38,
-   PIPE_FORMAT_R32G32B32A32_USCALED    = 39,
-   PIPE_FORMAT_R32_SNORM               = 40,
-   PIPE_FORMAT_R32G32_SNORM            = 41,
-   PIPE_FORMAT_R32G32B32_SNORM         = 42,
-   PIPE_FORMAT_R32G32B32A32_SNORM      = 43,
-   PIPE_FORMAT_R32_SSCALED             = 44,
-   PIPE_FORMAT_R32G32_SSCALED          = 45,
-   PIPE_FORMAT_R32G32B32_SSCALED       = 46,
-   PIPE_FORMAT_R32G32B32A32_SSCALED    = 47,
-   PIPE_FORMAT_R16_UNORM               = 48,
-   PIPE_FORMAT_R16G16_UNORM            = 49,
-   PIPE_FORMAT_R16G16B16_UNORM         = 50,
-   PIPE_FORMAT_R16G16B16A16_UNORM      = 51,
-   PIPE_FORMAT_R16_USCALED             = 52,
-   PIPE_FORMAT_R16G16_USCALED          = 53,
-   PIPE_FORMAT_R16G16B16_USCALED       = 54,
-   PIPE_FORMAT_R16G16B16A16_USCALED    = 55,
-   PIPE_FORMAT_R16_SNORM               = 56,
-   PIPE_FORMAT_R16G16_SNORM            = 57,
-   PIPE_FORMAT_R16G16B16_SNORM         = 58,
-   PIPE_FORMAT_R16G16B16A16_SNORM      = 59,
-   PIPE_FORMAT_R16_SSCALED             = 60,
-   PIPE_FORMAT_R16G16_SSCALED          = 61,
-   PIPE_FORMAT_R16G16B16_SSCALED       = 62,
-   PIPE_FORMAT_R16G16B16A16_SSCALED    = 63,
-   PIPE_FORMAT_R8_UNORM                = 64,
-   PIPE_FORMAT_R8G8_UNORM              = 65,
-   PIPE_FORMAT_R8G8B8_UNORM            = 66,
-   PIPE_FORMAT_R8G8B8A8_UNORM          = 67,
-   PIPE_FORMAT_X8B8G8R8_UNORM          = 68,
-   PIPE_FORMAT_R8_USCALED              = 69,
-   PIPE_FORMAT_R8G8_USCALED            = 70,
-   PIPE_FORMAT_R8G8B8_USCALED          = 71,
-   PIPE_FORMAT_R8G8B8A8_USCALED        = 72,
-   PIPE_FORMAT_R8_SNORM                = 74,
-   PIPE_FORMAT_R8G8_SNORM              = 75,
-   PIPE_FORMAT_R8G8B8_SNORM            = 76,
-   PIPE_FORMAT_R8G8B8A8_SNORM          = 77,
-   PIPE_FORMAT_R8_SSCALED              = 82,
-   PIPE_FORMAT_R8G8_SSCALED            = 83,
-   PIPE_FORMAT_R8G8B8_SSCALED          = 84,
-   PIPE_FORMAT_R8G8B8A8_SSCALED        = 85,
-   PIPE_FORMAT_R32_FIXED               = 87,
-   PIPE_FORMAT_R32G32_FIXED            = 88,
-   PIPE_FORMAT_R32G32B32_FIXED         = 89,
-   PIPE_FORMAT_R32G32B32A32_FIXED      = 90,
-   PIPE_FORMAT_R16_FLOAT               = 91,
-   PIPE_FORMAT_R16G16_FLOAT            = 92,
-   PIPE_FORMAT_R16G16B16_FLOAT         = 93,
-   PIPE_FORMAT_R16G16B16A16_FLOAT      = 94,
+   PIPE_FORMAT_NONE,
+   PIPE_FORMAT_B8G8R8A8_UNORM,
+   PIPE_FORMAT_B8G8R8X8_UNORM,
+   PIPE_FORMAT_A8R8G8B8_UNORM,
+   PIPE_FORMAT_X8R8G8B8_UNORM,
+   PIPE_FORMAT_B5G5R5A1_UNORM,
+   PIPE_FORMAT_B4G4R4A4_UNORM,
+   PIPE_FORMAT_B5G6R5_UNORM,
+   PIPE_FORMAT_R10G10B10A2_UNORM,
+   PIPE_FORMAT_L8_UNORM,    /**< ubyte luminance */
+   PIPE_FORMAT_A8_UNORM,    /**< ubyte alpha */
+   PIPE_FORMAT_I8_UNORM,    /**< ubyte intensity */
+   PIPE_FORMAT_L8A8_UNORM,  /**< ubyte alpha, luminance */
+   PIPE_FORMAT_L16_UNORM,   /**< ushort luminance */
+   PIPE_FORMAT_UYVY,
+   PIPE_FORMAT_YUYV,
+   PIPE_FORMAT_Z16_UNORM,
+   PIPE_FORMAT_Z32_UNORM,
+   PIPE_FORMAT_Z32_FLOAT,
+   PIPE_FORMAT_Z24_UNORM_S8_UINT,
+   PIPE_FORMAT_S8_UINT_Z24_UNORM,
+   PIPE_FORMAT_Z24X8_UNORM,
+   PIPE_FORMAT_X8Z24_UNORM,
+   PIPE_FORMAT_S8_UINT,     /**< ubyte stencil */
+   PIPE_FORMAT_R64_FLOAT,
+   PIPE_FORMAT_R64G64_FLOAT,
+   PIPE_FORMAT_R64G64B64_FLOAT,
+   PIPE_FORMAT_R64G64B64A64_FLOAT,
+   PIPE_FORMAT_R32_FLOAT,
+   PIPE_FORMAT_R32G32_FLOAT,
+   PIPE_FORMAT_R32G32B32_FLOAT,
+   PIPE_FORMAT_R32G32B32A32_FLOAT,
+   PIPE_FORMAT_R32_UNORM,
+   PIPE_FORMAT_R32G32_UNORM,
+   PIPE_FORMAT_R32G32B32_UNORM,
+   PIPE_FORMAT_R32G32B32A32_UNORM,
+   PIPE_FORMAT_R32_USCALED,
+   PIPE_FORMAT_R32G32_USCALED,
+   PIPE_FORMAT_R32G32B32_USCALED,
+   PIPE_FORMAT_R32G32B32A32_USCALED,
+   PIPE_FORMAT_R32_SNORM,
+   PIPE_FORMAT_R32G32_SNORM,
+   PIPE_FORMAT_R32G32B32_SNORM,
+   PIPE_FORMAT_R32G32B32A32_SNORM,
+   PIPE_FORMAT_R32_SSCALED,
+   PIPE_FORMAT_R32G32_SSCALED,
+   PIPE_FORMAT_R32G32B32_SSCALED,
+   PIPE_FORMAT_R32G32B32A32_SSCALED,
+   PIPE_FORMAT_R16_UNORM,
+   PIPE_FORMAT_R16G16_UNORM,
+   PIPE_FORMAT_R16G16B16_UNORM,
+   PIPE_FORMAT_R16G16B16A16_UNORM,
+   PIPE_FORMAT_R16_USCALED,
+   PIPE_FORMAT_R16G16_USCALED,
+   PIPE_FORMAT_R16G16B16_USCALED,
+   PIPE_FORMAT_R16G16B16A16_USCALED,
+   PIPE_FORMAT_R16_SNORM,
+   PIPE_FORMAT_R16G16_SNORM,
+   PIPE_FORMAT_R16G16B16_SNORM,
+   PIPE_FORMAT_R16G16B16A16_SNORM,
+   PIPE_FORMAT_R16_SSCALED,
+   PIPE_FORMAT_R16G16_SSCALED,
+   PIPE_FORMAT_R16G16B16_SSCALED,
+   PIPE_FORMAT_R16G16B16A16_SSCALED,
+   PIPE_FORMAT_R8_UNORM,
+   PIPE_FORMAT_R8G8_UNORM,
+   PIPE_FORMAT_R8G8B8_UNORM,
+   PIPE_FORMAT_R8G8B8A8_UNORM,
+   PIPE_FORMAT_X8B8G8R8_UNORM,
+   PIPE_FORMAT_R8_USCALED,
+   PIPE_FORMAT_R8G8_USCALED,
+   PIPE_FORMAT_R8G8B8_USCALED,
+   PIPE_FORMAT_R8G8B8A8_USCALED,
+   PIPE_FORMAT_R8_SNORM,
+   PIPE_FORMAT_R8G8_SNORM,
+   PIPE_FORMAT_R8G8B8_SNORM,
+   PIPE_FORMAT_R8G8B8A8_SNORM,
+   PIPE_FORMAT_R8_SSCALED,
+   PIPE_FORMAT_R8G8_SSCALED,
+   PIPE_FORMAT_R8G8B8_SSCALED,
+   PIPE_FORMAT_R8G8B8A8_SSCALED,
+   PIPE_FORMAT_R32_FIXED,
+   PIPE_FORMAT_R32G32_FIXED,
+   PIPE_FORMAT_R32G32B32_FIXED,
+   PIPE_FORMAT_R32G32B32A32_FIXED,
+   PIPE_FORMAT_R16_FLOAT,
+   PIPE_FORMAT_R16G16_FLOAT,
+   PIPE_FORMAT_R16G16B16_FLOAT,
+   PIPE_FORMAT_R16G16B16A16_FLOAT,
 
    /* sRGB formats */
-   PIPE_FORMAT_L8_SRGB                 = 95,
-   PIPE_FORMAT_L8A8_SRGB               = 96,
-   PIPE_FORMAT_R8G8B8_SRGB             = 97,
-   PIPE_FORMAT_A8B8G8R8_SRGB           = 98,
-   PIPE_FORMAT_X8B8G8R8_SRGB           = 99,
-   PIPE_FORMAT_B8G8R8A8_SRGB           = 100,
-   PIPE_FORMAT_B8G8R8X8_SRGB           = 101,
-   PIPE_FORMAT_A8R8G8B8_SRGB           = 102,
-   PIPE_FORMAT_X8R8G8B8_SRGB           = 103,
-   PIPE_FORMAT_R8G8B8A8_SRGB           = 104,
+   PIPE_FORMAT_L8_SRGB,
+   PIPE_FORMAT_L8A8_SRGB,
+   PIPE_FORMAT_R8G8B8_SRGB,
+   PIPE_FORMAT_A8B8G8R8_SRGB,
+   PIPE_FORMAT_X8B8G8R8_SRGB,
+   PIPE_FORMAT_B8G8R8A8_SRGB,
+   PIPE_FORMAT_B8G8R8X8_SRGB,
+   PIPE_FORMAT_A8R8G8B8_SRGB,
+   PIPE_FORMAT_X8R8G8B8_SRGB,
+   PIPE_FORMAT_R8G8B8A8_SRGB,
 
    /* compressed formats */
-   PIPE_FORMAT_DXT1_RGB                = 105,
-   PIPE_FORMAT_DXT1_RGBA               = 106,
-   PIPE_FORMAT_DXT3_RGBA               = 107,
-   PIPE_FORMAT_DXT5_RGBA               = 108,
+   PIPE_FORMAT_DXT1_RGB,
+   PIPE_FORMAT_DXT1_RGBA,
+   PIPE_FORMAT_DXT3_RGBA,
+   PIPE_FORMAT_DXT5_RGBA,
 
    /* sRGB, compressed */
-   PIPE_FORMAT_DXT1_SRGB               = 109,
-   PIPE_FORMAT_DXT1_SRGBA              = 110,
-   PIPE_FORMAT_DXT3_SRGBA              = 111,
-   PIPE_FORMAT_DXT5_SRGBA              = 112,
+   PIPE_FORMAT_DXT1_SRGB,
+   PIPE_FORMAT_DXT1_SRGBA,
+   PIPE_FORMAT_DXT3_SRGBA,
+   PIPE_FORMAT_DXT5_SRGBA,
 
    /* rgtc compressed */
-   PIPE_FORMAT_RGTC1_UNORM             = 113,
-   PIPE_FORMAT_RGTC1_SNORM             = 114,
-   PIPE_FORMAT_RGTC2_UNORM             = 115,
-   PIPE_FORMAT_RGTC2_SNORM             = 116,
+   PIPE_FORMAT_RGTC1_UNORM,
+   PIPE_FORMAT_RGTC1_SNORM,
+   PIPE_FORMAT_RGTC2_UNORM,
+   PIPE_FORMAT_RGTC2_SNORM,
 
-   PIPE_FORMAT_R8G8_B8G8_UNORM         = 117,
-   PIPE_FORMAT_G8R8_G8B8_UNORM         = 118,
+   PIPE_FORMAT_R8G8_B8G8_UNORM,
+   PIPE_FORMAT_G8R8_G8B8_UNORM,
 
    /* mixed formats */
-   PIPE_FORMAT_R8SG8SB8UX8U_NORM       = 119,
-   PIPE_FORMAT_R5SG5SB6U_NORM          = 120,
+   PIPE_FORMAT_R8SG8SB8UX8U_NORM,
+   PIPE_FORMAT_R5SG5SB6U_NORM,
 
    /* TODO: re-order these */
-   PIPE_FORMAT_A8B8G8R8_UNORM          = 121,
-   PIPE_FORMAT_B5G5R5X1_UNORM          = 122,
-   PIPE_FORMAT_R10G10B10A2_USCALED     = 123,
-   PIPE_FORMAT_R11G11B10_FLOAT         = 124,
-   PIPE_FORMAT_R9G9B9E5_FLOAT          = 125,
-   PIPE_FORMAT_Z32_FLOAT_S8X24_UINT    = 126,
-   PIPE_FORMAT_R1_UNORM                = 127,
-   PIPE_FORMAT_R10G10B10X2_USCALED     = 128,
-   PIPE_FORMAT_R10G10B10X2_SNORM       = 129,
-   PIPE_FORMAT_L4A4_UNORM              = 130,
-   PIPE_FORMAT_B10G10R10A2_UNORM       = 131,
-   PIPE_FORMAT_R10SG10SB10SA2U_NORM    = 132,
-   PIPE_FORMAT_R8G8Bx_SNORM            = 133,
-   PIPE_FORMAT_R8G8B8X8_UNORM          = 134,
-   PIPE_FORMAT_B4G4R4X4_UNORM          = 135,
+   PIPE_FORMAT_A8B8G8R8_UNORM,
+   PIPE_FORMAT_B5G5R5X1_UNORM,
+   PIPE_FORMAT_R10G10B10A2_USCALED,
+   PIPE_FORMAT_R11G11B10_FLOAT,
+   PIPE_FORMAT_R9G9B9E5_FLOAT,
+   PIPE_FORMAT_Z32_FLOAT_S8X24_UINT,
+   PIPE_FORMAT_R1_UNORM,
+   PIPE_FORMAT_R10G10B10X2_USCALED,
+   PIPE_FORMAT_R10G10B10X2_SNORM,
+   PIPE_FORMAT_L4A4_UNORM,
+   PIPE_FORMAT_B10G10R10A2_UNORM,
+   PIPE_FORMAT_R10SG10SB10SA2U_NORM,
+   PIPE_FORMAT_R8G8Bx_SNORM,
+   PIPE_FORMAT_R8G8B8X8_UNORM,
+   PIPE_FORMAT_B4G4R4X4_UNORM,
 
    /* some stencil samplers formats */
-   PIPE_FORMAT_X24S8_UINT              = 136,
-   PIPE_FORMAT_S8X24_UINT              = 137,
-   PIPE_FORMAT_X32_S8X24_UINT          = 138,
-
-   PIPE_FORMAT_B2G3R3_UNORM            = 139,
-   PIPE_FORMAT_L16A16_UNORM            = 140,
-   PIPE_FORMAT_A16_UNORM               = 141,
-   PIPE_FORMAT_I16_UNORM               = 142,
-
-   PIPE_FORMAT_LATC1_UNORM             = 143,
-   PIPE_FORMAT_LATC1_SNORM             = 144,
-   PIPE_FORMAT_LATC2_UNORM             = 145,
-   PIPE_FORMAT_LATC2_SNORM             = 146,
-
-   PIPE_FORMAT_A8_SNORM                = 147,
-   PIPE_FORMAT_L8_SNORM                = 148,
-   PIPE_FORMAT_L8A8_SNORM              = 149,
-   PIPE_FORMAT_I8_SNORM                = 150,
-   PIPE_FORMAT_A16_SNORM               = 151,
-   PIPE_FORMAT_L16_SNORM               = 152,
-   PIPE_FORMAT_L16A16_SNORM            = 153,
-   PIPE_FORMAT_I16_SNORM               = 154,
-
-   PIPE_FORMAT_A16_FLOAT               = 155,
-   PIPE_FORMAT_L16_FLOAT               = 156,
-   PIPE_FORMAT_L16A16_FLOAT            = 157,
-   PIPE_FORMAT_I16_FLOAT               = 158,
-   PIPE_FORMAT_A32_FLOAT               = 159,
-   PIPE_FORMAT_L32_FLOAT               = 160,
-   PIPE_FORMAT_L32A32_FLOAT            = 161,
-   PIPE_FORMAT_I32_FLOAT               = 162,
-
-   PIPE_FORMAT_YV12                    = 163,
-   PIPE_FORMAT_YV16                    = 164,
-   PIPE_FORMAT_IYUV                    = 165,  /**< aka I420 */
-   PIPE_FORMAT_NV12                    = 166,
-   PIPE_FORMAT_NV21                    = 167,
-
-   PIPE_FORMAT_A4R4_UNORM              = 168,
-   PIPE_FORMAT_R4A4_UNORM              = 169,
-   PIPE_FORMAT_R8A8_UNORM              = 170,
-   PIPE_FORMAT_A8R8_UNORM              = 171,
-
-   PIPE_FORMAT_R10G10B10A2_SSCALED     = 172,
-   PIPE_FORMAT_R10G10B10A2_SNORM       = 173,
-
-   PIPE_FORMAT_B10G10R10A2_USCALED     = 174,
-   PIPE_FORMAT_B10G10R10A2_SSCALED     = 175,
-   PIPE_FORMAT_B10G10R10A2_SNORM       = 176,
-
-   PIPE_FORMAT_R8_UINT                 = 177,
-   PIPE_FORMAT_R8G8_UINT               = 178,
-   PIPE_FORMAT_R8G8B8_UINT             = 179,
-   PIPE_FORMAT_R8G8B8A8_UINT           = 180,
-
-   PIPE_FORMAT_R8_SINT                 = 181,
-   PIPE_FORMAT_R8G8_SINT               = 182,
-   PIPE_FORMAT_R8G8B8_SINT             = 183,
-   PIPE_FORMAT_R8G8B8A8_SINT           = 184,
-
-   PIPE_FORMAT_R16_UINT                = 185,
-   PIPE_FORMAT_R16G16_UINT             = 186,
-   PIPE_FORMAT_R16G16B16_UINT          = 187,
-   PIPE_FORMAT_R16G16B16A16_UINT       = 188,
-
-   PIPE_FORMAT_R16_SINT                = 189,
-   PIPE_FORMAT_R16G16_SINT             = 190,
-   PIPE_FORMAT_R16G16B16_SINT          = 191,
-   PIPE_FORMAT_R16G16B16A16_SINT       = 192,
-
-   PIPE_FORMAT_R32_UINT                = 193,
-   PIPE_FORMAT_R32G32_UINT             = 194,
-   PIPE_FORMAT_R32G32B32_UINT          = 195,
-   PIPE_FORMAT_R32G32B32A32_UINT       = 196,
-
-   PIPE_FORMAT_R32_SINT                = 197,
-   PIPE_FORMAT_R32G32_SINT             = 198,
-   PIPE_FORMAT_R32G32B32_SINT          = 199,
-   PIPE_FORMAT_R32G32B32A32_SINT       = 200,
-
-   PIPE_FORMAT_A8_UINT                 = 201,
-   PIPE_FORMAT_I8_UINT                 = 202,
-   PIPE_FORMAT_L8_UINT                 = 203,
-   PIPE_FORMAT_L8A8_UINT               = 204,
-
-   PIPE_FORMAT_A8_SINT                 = 205,
-   PIPE_FORMAT_I8_SINT                 = 206,
-   PIPE_FORMAT_L8_SINT                 = 207,
-   PIPE_FORMAT_L8A8_SINT               = 208,
-
-   PIPE_FORMAT_A16_UINT                = 209,
-   PIPE_FORMAT_I16_UINT                = 210,
-   PIPE_FORMAT_L16_UINT                = 211,
-   PIPE_FORMAT_L16A16_UINT             = 212,
-
-   PIPE_FORMAT_A16_SINT                = 213,
-   PIPE_FORMAT_I16_SINT                = 214,
-   PIPE_FORMAT_L16_SINT                = 215,
-   PIPE_FORMAT_L16A16_SINT             = 216,
-
-   PIPE_FORMAT_A32_UINT                = 217,
-   PIPE_FORMAT_I32_UINT                = 218,
-   PIPE_FORMAT_L32_UINT                = 219,
-   PIPE_FORMAT_L32A32_UINT             = 220,
-
-   PIPE_FORMAT_A32_SINT                = 221,
-   PIPE_FORMAT_I32_SINT                = 222,
-   PIPE_FORMAT_L32_SINT                = 223,
-   PIPE_FORMAT_L32A32_SINT             = 224,
-
-   PIPE_FORMAT_B10G10R10A2_UINT        = 225, 
-
-   PIPE_FORMAT_ETC1_RGB8               = 226,
-
-   PIPE_FORMAT_R8G8_R8B8_UNORM         = 227,
-   PIPE_FORMAT_G8R8_B8R8_UNORM         = 228,
-
-   PIPE_FORMAT_R8G8B8X8_SNORM          = 229,
-   PIPE_FORMAT_R8G8B8X8_SRGB           = 230,
-   PIPE_FORMAT_R8G8B8X8_UINT           = 231,
-   PIPE_FORMAT_R8G8B8X8_SINT           = 232,
-   PIPE_FORMAT_B10G10R10X2_UNORM       = 233,
-   PIPE_FORMAT_R16G16B16X16_UNORM      = 234,
-   PIPE_FORMAT_R16G16B16X16_SNORM      = 235,
-   PIPE_FORMAT_R16G16B16X16_FLOAT      = 236,
-   PIPE_FORMAT_R16G16B16X16_UINT       = 237,
-   PIPE_FORMAT_R16G16B16X16_SINT       = 238,
-   PIPE_FORMAT_R32G32B32X32_FLOAT      = 239,
-   PIPE_FORMAT_R32G32B32X32_UINT       = 240,
-   PIPE_FORMAT_R32G32B32X32_SINT       = 241,
-
-   PIPE_FORMAT_R8A8_SNORM              = 242,
-   PIPE_FORMAT_R16A16_UNORM            = 243,
-   PIPE_FORMAT_R16A16_SNORM            = 244,
-   PIPE_FORMAT_R16A16_FLOAT            = 245,
-   PIPE_FORMAT_R32A32_FLOAT            = 246,
-   PIPE_FORMAT_R8A8_UINT               = 247,
-   PIPE_FORMAT_R8A8_SINT               = 248,
-   PIPE_FORMAT_R16A16_UINT             = 249,
-   PIPE_FORMAT_R16A16_SINT             = 250,
-   PIPE_FORMAT_R32A32_UINT             = 251,
-   PIPE_FORMAT_R32A32_SINT             = 252,
-   PIPE_FORMAT_R10G10B10A2_UINT        = 253,
-
-   PIPE_FORMAT_B5G6R5_SRGB             = 254,
-
-   PIPE_FORMAT_BPTC_RGBA_UNORM         = 255,
-   PIPE_FORMAT_BPTC_SRGBA              = 256,
-   PIPE_FORMAT_BPTC_RGB_FLOAT          = 257,
-   PIPE_FORMAT_BPTC_RGB_UFLOAT         = 258,
-
-   PIPE_FORMAT_A8L8_UNORM              = 259,
-   PIPE_FORMAT_A8L8_SNORM              = 260,
-   PIPE_FORMAT_A8L8_SRGB               = 261,
-   PIPE_FORMAT_A16L16_UNORM            = 262,
-
-   PIPE_FORMAT_G8R8_UNORM              = 263,
-   PIPE_FORMAT_G8R8_SNORM              = 264,
-   PIPE_FORMAT_G16R16_UNORM            = 265,
-   PIPE_FORMAT_G16R16_SNORM            = 266,
-
-   PIPE_FORMAT_A8B8G8R8_SNORM          = 267,
-   PIPE_FORMAT_X8B8G8R8_SNORM          = 268,
-
-   PIPE_FORMAT_ETC2_RGB8               = 269,
-   PIPE_FORMAT_ETC2_SRGB8              = 270,
-   PIPE_FORMAT_ETC2_RGB8A1             = 271,
-   PIPE_FORMAT_ETC2_SRGB8A1            = 272,
-   PIPE_FORMAT_ETC2_RGBA8              = 273,
-   PIPE_FORMAT_ETC2_SRGBA8             = 274,
-   PIPE_FORMAT_ETC2_R11_UNORM          = 275,
-   PIPE_FORMAT_ETC2_R11_SNORM          = 276,
-   PIPE_FORMAT_ETC2_RG11_UNORM         = 277,
-   PIPE_FORMAT_ETC2_RG11_SNORM         = 278,
-
-   PIPE_FORMAT_ASTC_4x4                = 279,
-   PIPE_FORMAT_ASTC_5x4                = 280,
-   PIPE_FORMAT_ASTC_5x5                = 281,
-   PIPE_FORMAT_ASTC_6x5                = 282,
-   PIPE_FORMAT_ASTC_6x6                = 283,
-   PIPE_FORMAT_ASTC_8x5                = 284,
-   PIPE_FORMAT_ASTC_8x6                = 285,
-   PIPE_FORMAT_ASTC_8x8                = 286,
-   PIPE_FORMAT_ASTC_10x5               = 287,
-   PIPE_FORMAT_ASTC_10x6               = 288,
-   PIPE_FORMAT_ASTC_10x8               = 289,
-   PIPE_FORMAT_ASTC_10x10              = 290,
-   PIPE_FORMAT_ASTC_12x10              = 291,
-   PIPE_FORMAT_ASTC_12x12              = 292,
-
-   PIPE_FORMAT_ASTC_4x4_SRGB           = 293,
-   PIPE_FORMAT_ASTC_5x4_SRGB           = 294,
-   PIPE_FORMAT_ASTC_5x5_SRGB           = 295,
-   PIPE_FORMAT_ASTC_6x5_SRGB           = 296,
-   PIPE_FORMAT_ASTC_6x6_SRGB           = 297,
-   PIPE_FORMAT_ASTC_8x5_SRGB           = 298,
-   PIPE_FORMAT_ASTC_8x6_SRGB           = 299,
-   PIPE_FORMAT_ASTC_8x8_SRGB           = 300,
-   PIPE_FORMAT_ASTC_10x5_SRGB          = 301,
-   PIPE_FORMAT_ASTC_10x6_SRGB          = 302,
-   PIPE_FORMAT_ASTC_10x8_SRGB          = 303,
-   PIPE_FORMAT_ASTC_10x10_SRGB         = 304,
-   PIPE_FORMAT_ASTC_12x10_SRGB         = 305,
-   PIPE_FORMAT_ASTC_12x12_SRGB         = 306,
-
-   PIPE_FORMAT_P016                    = 307,
-
-   PIPE_FORMAT_R10G10B10X2_UNORM       = 308,
-   PIPE_FORMAT_A1B5G5R5_UNORM          = 309,
-   PIPE_FORMAT_X1B5G5R5_UNORM          = 310,
-   PIPE_FORMAT_A4B4G4R4_UNORM          = 311,
-
-   PIPE_FORMAT_R8_SRGB                 = 312,
-
-   PIPE_FORMAT_A8L8_SINT               = 313,
-   PIPE_FORMAT_G8R8_SINT               = 314,
-   PIPE_FORMAT_A8B8G8R8_SINT           = 315,
-   PIPE_FORMAT_X8B8G8R8_SINT           = 316,
-
-   PIPE_FORMAT_ATC_RGB                 = 317,
-   PIPE_FORMAT_ATC_RGBA_EXPLICIT       = 318,
-   PIPE_FORMAT_ATC_RGBA_INTERPOLATED   = 319,
-
-   PIPE_FORMAT_Z24_UNORM_S8_UINT_AS_R8G8B8A8 = 320,
-
-   PIPE_FORMAT_AYUV                    = 321,
-   PIPE_FORMAT_XYUV                    = 322,
+   PIPE_FORMAT_X24S8_UINT,
+   PIPE_FORMAT_S8X24_UINT,
+   PIPE_FORMAT_X32_S8X24_UINT,
+
+   PIPE_FORMAT_B2G3R3_UNORM,
+   PIPE_FORMAT_L16A16_UNORM,
+   PIPE_FORMAT_A16_UNORM,
+   PIPE_FORMAT_I16_UNORM,
+
+   PIPE_FORMAT_LATC1_UNORM,
+   PIPE_FORMAT_LATC1_SNORM,
+   PIPE_FORMAT_LATC2_UNORM,
+   PIPE_FORMAT_LATC2_SNORM,
+
+   PIPE_FORMAT_A8_SNORM,
+   PIPE_FORMAT_L8_SNORM,
+   PIPE_FORMAT_L8A8_SNORM,
+   PIPE_FORMAT_I8_SNORM,
+   PIPE_FORMAT_A16_SNORM,
+   PIPE_FORMAT_L16_SNORM,
+   PIPE_FORMAT_L16A16_SNORM,
+   PIPE_FORMAT_I16_SNORM,
+
+   PIPE_FORMAT_A16_FLOAT,
+   PIPE_FORMAT_L16_FLOAT,
+   PIPE_FORMAT_L16A16_FLOAT,
+   PIPE_FORMAT_I16_FLOAT,
+   PIPE_FORMAT_A32_FLOAT,
+   PIPE_FORMAT_L32_FLOAT,
+   PIPE_FORMAT_L32A32_FLOAT,
+   PIPE_FORMAT_I32_FLOAT,
+
+   PIPE_FORMAT_YV12,
+   PIPE_FORMAT_YV16,
+   PIPE_FORMAT_IYUV,  /**< aka I420 */
+   PIPE_FORMAT_NV12,
+   PIPE_FORMAT_NV21,
+
+   PIPE_FORMAT_A4R4_UNORM,
+   PIPE_FORMAT_R4A4_UNORM,
+   PIPE_FORMAT_R8A8_UNORM,
+   PIPE_FORMAT_A8R8_UNORM,
+
+   PIPE_FORMAT_R10G10B10A2_SSCALED,
+   PIPE_FORMAT_R10G10B10A2_SNORM,
+
+   PIPE_FORMAT_B10G10R10A2_USCALED,
+   PIPE_FORMAT_B10G10R10A2_SSCALED,
+   PIPE_FORMAT_B10G10R10A2_SNORM,
+
+   PIPE_FORMAT_R8_UINT,
+   PIPE_FORMAT_R8G8_UINT,
+   PIPE_FORMAT_R8G8B8_UINT,
+   PIPE_FORMAT_R8G8B8A8_UINT,
+
+   PIPE_FORMAT_R8_SINT,
+   PIPE_FORMAT_R8G8_SINT,
+   PIPE_FORMAT_R8G8B8_SINT,
+   PIPE_FORMAT_R8G8B8A8_SINT,
+
+   PIPE_FORMAT_R16_UINT,
+   PIPE_FORMAT_R16G16_UINT,
+   PIPE_FORMAT_R16G16B16_UINT,
+   PIPE_FORMAT_R16G16B16A16_UINT,
+
+   PIPE_FORMAT_R16_SINT,
+   PIPE_FORMAT_R16G16_SINT,
+   PIPE_FORMAT_R16G16B16_SINT,
+   PIPE_FORMAT_R16G16B16A16_SINT,
+
+   PIPE_FORMAT_R32_UINT,
+   PIPE_FORMAT_R32G32_UINT,
+   PIPE_FORMAT_R32G32B32_UINT,
+   PIPE_FORMAT_R32G32B32A32_UINT,
+
+   PIPE_FORMAT_R32_SINT,
+   PIPE_FORMAT_R32G32_SINT,
+   PIPE_FORMAT_R32G32B32_SINT,
+   PIPE_FORMAT_R32G32B32A32_SINT,
+
+   PIPE_FORMAT_A8_UINT,
+   PIPE_FORMAT_I8_UINT,
+   PIPE_FORMAT_L8_UINT,
+   PIPE_FORMAT_L8A8_UINT,
+
+   PIPE_FORMAT_A8_SINT,
+   PIPE_FORMAT_I8_SINT,
+   PIPE_FORMAT_L8_SINT,
+   PIPE_FORMAT_L8A8_SINT,
+
+   PIPE_FORMAT_A16_UINT,
+   PIPE_FORMAT_I16_UINT,
+   PIPE_FORMAT_L16_UINT,
+   PIPE_FORMAT_L16A16_UINT,
+
+   PIPE_FORMAT_A16_SINT,
+   PIPE_FORMAT_I16_SINT,
+   PIPE_FORMAT_L16_SINT,
+   PIPE_FORMAT_L16A16_SINT,
+
+   PIPE_FORMAT_A32_UINT,
+   PIPE_FORMAT_I32_UINT,
+   PIPE_FORMAT_L32_UINT,
+   PIPE_FORMAT_L32A32_UINT,
+
+   PIPE_FORMAT_A32_SINT,
+   PIPE_FORMAT_I32_SINT,
+   PIPE_FORMAT_L32_SINT,
+   PIPE_FORMAT_L32A32_SINT,
+
+   PIPE_FORMAT_B10G10R10A2_UINT,
+
+   PIPE_FORMAT_ETC1_RGB8,
+
+   PIPE_FORMAT_R8G8_R8B8_UNORM,
+   PIPE_FORMAT_G8R8_B8R8_UNORM,
+
+   PIPE_FORMAT_R8G8B8X8_SNORM,
+   PIPE_FORMAT_R8G8B8X8_SRGB,
+   PIPE_FORMAT_R8G8B8X8_UINT,
+   PIPE_FORMAT_R8G8B8X8_SINT,
+   PIPE_FORMAT_B10G10R10X2_UNORM,
+   PIPE_FORMAT_R16G16B16X16_UNORM,
+   PIPE_FORMAT_R16G16B16X16_SNORM,
+   PIPE_FORMAT_R16G16B16X16_FLOAT,
+   PIPE_FORMAT_R16G16B16X16_UINT,
+   PIPE_FORMAT_R16G16B16X16_SINT,
+   PIPE_FORMAT_R32G32B32X32_FLOAT,
+   PIPE_FORMAT_R32G32B32X32_UINT,
+   PIPE_FORMAT_R32G32B32X32_SINT,
+
+   PIPE_FORMAT_R8A8_SNORM,
+   PIPE_FORMAT_R16A16_UNORM,
+   PIPE_FORMAT_R16A16_SNORM,
+   PIPE_FORMAT_R16A16_FLOAT,
+   PIPE_FORMAT_R32A32_FLOAT,
+   PIPE_FORMAT_R8A8_UINT,
+   PIPE_FORMAT_R8A8_SINT,
+   PIPE_FORMAT_R16A16_UINT,
+   PIPE_FORMAT_R16A16_SINT,
+   PIPE_FORMAT_R32A32_UINT,
+   PIPE_FORMAT_R32A32_SINT,
+   PIPE_FORMAT_R10G10B10A2_UINT,
+
+   PIPE_FORMAT_B5G6R5_SRGB,
+
+   PIPE_FORMAT_BPTC_RGBA_UNORM,
+   PIPE_FORMAT_BPTC_SRGBA,
+   PIPE_FORMAT_BPTC_RGB_FLOAT,
+   PIPE_FORMAT_BPTC_RGB_UFLOAT,
+
+   PIPE_FORMAT_A8L8_UNORM,
+   PIPE_FORMAT_A8L8_SNORM,
+   PIPE_FORMAT_A8L8_SRGB,
+   PIPE_FORMAT_A16L16_UNORM,
+
+   PIPE_FORMAT_G8R8_UNORM,
+   PIPE_FORMAT_G8R8_SNORM,
+   PIPE_FORMAT_G16R16_UNORM,
+   PIPE_FORMAT_G16R16_SNORM,
+
+   PIPE_FORMAT_A8B8G8R8_SNORM,
+   PIPE_FORMAT_X8B8G8R8_SNORM,
+
+   PIPE_FORMAT_ETC2_RGB8,
+   PIPE_FORMAT_ETC2_SRGB8,
+   PIPE_FORMAT_ETC2_RGB8A1,
+   PIPE_FORMAT_ETC2_SRGB8A1,
+   PIPE_FORMAT_ETC2_RGBA8,
+   PIPE_FORMAT_ETC2_SRGBA8,
+   PIPE_FORMAT_ETC2_R11_UNORM,
+   PIPE_FORMAT_ETC2_R11_SNORM,
+   PIPE_FORMAT_ETC2_RG11_UNORM,
+   PIPE_FORMAT_ETC2_RG11_SNORM,
+
+   PIPE_FORMAT_ASTC_4x4,
+   PIPE_FORMAT_ASTC_5x4,
+   PIPE_FORMAT_ASTC_5x5,
+   PIPE_FORMAT_ASTC_6x5,
+   PIPE_FORMAT_ASTC_6x6,
+   PIPE_FORMAT_ASTC_8x5,
+   PIPE_FORMAT_ASTC_8x6,
+   PIPE_FORMAT_ASTC_8x8,
+   PIPE_FORMAT_ASTC_10x5,
+   PIPE_FORMAT_ASTC_10x6,
+   PIPE_FORMAT_ASTC_10x8,
+   PIPE_FORMAT_ASTC_10x10,
+   PIPE_FORMAT_ASTC_12x10,
+   PIPE_FORMAT_ASTC_12x12,
+
+   PIPE_FORMAT_ASTC_4x4_SRGB,
+   PIPE_FORMAT_ASTC_5x4_SRGB,
+   PIPE_FORMAT_ASTC_5x5_SRGB,
+   PIPE_FORMAT_ASTC_6x5_SRGB,
+   PIPE_FORMAT_ASTC_6x6_SRGB,
+   PIPE_FORMAT_ASTC_8x5_SRGB,
+   PIPE_FORMAT_ASTC_8x6_SRGB,
+   PIPE_FORMAT_ASTC_8x8_SRGB,
+   PIPE_FORMAT_ASTC_10x5_SRGB,
+   PIPE_FORMAT_ASTC_10x6_SRGB,
+   PIPE_FORMAT_ASTC_10x8_SRGB,
+   PIPE_FORMAT_ASTC_10x10_SRGB,
+   PIPE_FORMAT_ASTC_12x10_SRGB,
+   PIPE_FORMAT_ASTC_12x12_SRGB,
+
+   PIPE_FORMAT_P016,
+
+   PIPE_FORMAT_R10G10B10X2_UNORM,
+   PIPE_FORMAT_A1B5G5R5_UNORM,
+   PIPE_FORMAT_X1B5G5R5_UNORM,
+   PIPE_FORMAT_A4B4G4R4_UNORM,
+
+   PIPE_FORMAT_R8_SRGB,
+
+   PIPE_FORMAT_A8L8_SINT,
+   PIPE_FORMAT_G8R8_SINT,
+   PIPE_FORMAT_A8B8G8R8_SINT,
+   PIPE_FORMAT_X8B8G8R8_SINT,
+
+   PIPE_FORMAT_ATC_RGB,
+   PIPE_FORMAT_ATC_RGBA_EXPLICIT,
+   PIPE_FORMAT_ATC_RGBA_INTERPOLATED,
+
+   PIPE_FORMAT_Z24_UNORM_S8_UINT_AS_R8G8B8A8,
+
+   PIPE_FORMAT_AYUV,
+   PIPE_FORMAT_XYUV,
 
    PIPE_FORMAT_COUNT
 };