mesa: Change many Type P MESA_FORMATs to meet naming spec

Conversion of Type P formats as follows (w/related comment fixes):
    s/MESA_FORMAT_RGB565\b/MESA_FORMAT_B5G6R5_UNORM/g
    s/MESA_FORMAT_RGB565_REV\b/MESA_FORMAT_R5G6B5_UNORM/g
    s/MESA_FORMAT_ARGB4444\b/MESA_FORMAT_B4G4R4A4_UNORM/g
    s/MESA_FORMAT_ARGB4444_REV\b/MESA_FORMAT_A4R4G4B4_UNORM/g
    s/MESA_FORMAT_RGBA5551\b/MESA_FORMAT_A1B5G5R5_UNORM/g
    s/MESA_FORMAT_XBGR8888_SNORM\b/MESA_FORMAT_R8G8B8X8_SNORM/g
    s/MESA_FORMAT_XBGR8888_SRGB\b/MESA_FORMAT_R8G8B8X8_SRGB/g
    s/MESA_FORMAT_ARGB1555\b/MESA_FORMAT_B5G5R5A1_UNORM/g
    s/MESA_FORMAT_ARGB1555_REV\b/MESA_FORMAT_A1R5G5B5_UNORM/g
    s/MESA_FORMAT_AL44\b/MESA_FORMAT_L4A4_UNORM/g
    s/MESA_FORMAT_RGB332\b/MESA_FORMAT_B2G3R3_UNORM/g
    s/MESA_FORMAT_ARGB2101010\b/MESA_FORMAT_B10G10R10A2_UNORM/g
    s/MESA_FORMAT_Z24_S8\b/MESA_FORMAT_S8_UINT_Z24_UNORM/g
    s/MESA_FORMAT_S8_Z24\b/MESA_FORMAT_Z24_UNORM_S8_UINT/g
    s/MESA_FORMAT_X8_Z24\b/MESA_FORMAT_Z24_UNORM_X8_UINT/g
    s/MESA_FORMAT_Z24_X8\b/MESA_FORMAT_X8Z24_UNORM/g
    s/MESA_FORMAT_RGB9_E5_FLOAT\b/MESA_FORMAT_R9G9B9E5_FLOAT/g
    s/MESA_FORMAT_R11_G11_B10_FLOAT\b/MESA_FORMAT_R11G11B10_FLOAT/g
    s/MESA_FORMAT_Z32_FLOAT_X24S8\b/MESA_FORMAT_Z32_FLOAT_S8X24_UINT/g
    s/MESA_FORMAT_ABGR2101010_UINT\b/MESA_FORMAT_R10G10B10A2_UINT/g
    s/MESA_FORMAT_XRGB4444_UNORM\b/MESA_FORMAT_B4G4R4X4_UNORM/g
    s/MESA_FORMAT_XRGB1555_UNORM\b/MESA_FORMAT_B5G5R5X1_UNORM/g
    s/MESA_FORMAT_XRGB2101010_UNORM\b/MESA_FORMAT_B10G10R10X2_UNORM/g
    s/MESA_FORMAT_AL88\b/MESA_FORMAT_L8A8_UNORM/g
    s/MESA_FORMAT_AL88_REV\b/MESA_FORMAT_A8L8_UNORM/g
    s/MESA_FORMAT_AL1616\b/MESA_FORMAT_L16A16_UNORM/g
    s/MESA_FORMAT_AL1616_REV\b/MESA_FORMAT_A16L16_UNORM/g
    s/MESA_FORMAT_RG88\b/MESA_FORMAT_G8R8_UNORM/g
    s/MESA_FORMAT_GR88\b/MESA_FORMAT_R8G8_UNORM/g
    s/MESA_FORMAT_GR1616\b/MESA_FORMAT_R16G16_UNORM/g
    s/MESA_FORMAT_RG1616\b/MESA_FORMAT_G16R16_UNORM/g
    s/MESA_FORMAT_SRGBA8\b/MESA_FORMAT_A8B8G8R8_SRGB/g
    s/MESA_FORMAT_SARGB8\b/MESA_FORMAT_B8G8R8A8_SRGB/g
    s/MESA_FORMAT_SLA8\b/MESA_FORMAT_L8A8_SRGB/g

Conflicts:
	src/mesa/drivers/dri/i965/brw_surface_formats.c
	src/mesa/main/format_pack.c
	src/mesa/main/format_unpack.c
	src/mesa/main/formats.c
	src/mesa/main/texformat.c
	src/mesa/main/texstore.c

1 files changed, 78 insertions, 78 deletions

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 4c1d789eb76..bcfaf8dc1ea 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -1049,7 +1049,7 @@ _mesa_texstore_x8_z24(TEXSTORE_PARAMS)
    const GLuint depthScale = 0xffffff;
 
    (void) dims;
-   ASSERT(dstFormat == MESA_FORMAT_X8_Z24);
+   ASSERT(dstFormat == MESA_FORMAT_Z24_UNORM_S8_UINT);
 
    {
       /* general path */
@@ -1079,7 +1079,7 @@ _mesa_texstore_z24_x8(TEXSTORE_PARAMS)
    const GLuint depthScale = 0xffffff;
 
    (void) dims;
-   ASSERT(dstFormat == MESA_FORMAT_Z24_X8);
+   ASSERT(dstFormat == MESA_FORMAT_X8Z24_UNORM);
 
    {
       /* general path */
@@ -1141,8 +1141,8 @@ _mesa_texstore_z16(TEXSTORE_PARAMS)
 static GLboolean
 _mesa_texstore_rgb565(TEXSTORE_PARAMS)
 {
-   ASSERT(dstFormat == MESA_FORMAT_RGB565 ||
-          dstFormat == MESA_FORMAT_RGB565_REV);
+   ASSERT(dstFormat == MESA_FORMAT_B5G6R5_UNORM ||
+          dstFormat == MESA_FORMAT_R5G6B5_UNORM);
    ASSERT(_mesa_get_format_bytes(dstFormat) == 2);
 
    if (!ctx->_ImageTransferState &&
@@ -1163,7 +1163,7 @@ _mesa_texstore_rgb565(TEXSTORE_PARAMS)
          const GLubyte *srcUB = (const GLubyte *) src;
          GLushort *dstUS = (GLushort *) dst;
          /* check for byteswapped format */
-         if (dstFormat == MESA_FORMAT_RGB565) {
+         if (dstFormat == MESA_FORMAT_B5G6R5_UNORM) {
             for (col = 0; col < srcWidth; col++) {
                dstUS[col] = PACK_COLOR_565( srcUB[0], srcUB[1], srcUB[2] );
                srcUB += 3;
@@ -1525,8 +1525,8 @@ _mesa_texstore_bgr888(TEXSTORE_PARAMS)
 static GLboolean
 _mesa_texstore_argb2101010(TEXSTORE_PARAMS)
 {
-   ASSERT(dstFormat == MESA_FORMAT_ARGB2101010 ||
-          dstFormat == MESA_FORMAT_XRGB2101010_UNORM);
+   ASSERT(dstFormat == MESA_FORMAT_B10G10R10A2_UNORM ||
+          dstFormat == MESA_FORMAT_B10G10R10X2_UNORM);
    ASSERT(_mesa_get_format_bytes(dstFormat) == 4);
 
    {
@@ -1579,7 +1579,7 @@ _mesa_texstore_unorm44(TEXSTORE_PARAMS)
 {
    const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
 
-   ASSERT(dstFormat == MESA_FORMAT_AL44);
+   ASSERT(dstFormat == MESA_FORMAT_L4A4_UNORM);
    ASSERT(_mesa_get_format_bytes(dstFormat) == 1);
 
    {
@@ -1622,10 +1622,10 @@ _mesa_texstore_unorm88(TEXSTORE_PARAMS)
    const GLboolean littleEndian = _mesa_little_endian();
    const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
 
-   ASSERT(dstFormat == MESA_FORMAT_AL88 ||
-          dstFormat == MESA_FORMAT_AL88_REV ||
-          dstFormat == MESA_FORMAT_GR88 ||
-          dstFormat == MESA_FORMAT_RG88);
+   ASSERT(dstFormat == MESA_FORMAT_L8A8_UNORM ||
+          dstFormat == MESA_FORMAT_A8L8_UNORM ||
+          dstFormat == MESA_FORMAT_R8G8_UNORM ||
+          dstFormat == MESA_FORMAT_G8R8_UNORM);
    ASSERT(_mesa_get_format_bytes(dstFormat) == 2);
 
    if (!ctx->_ImageTransferState &&
@@ -1637,9 +1637,9 @@ _mesa_texstore_unorm88(TEXSTORE_PARAMS)
 
       /* dstmap - how to swizzle from RGBA to dst format:
        */
-      if (dstFormat == MESA_FORMAT_AL88 || dstFormat == MESA_FORMAT_AL88_REV) {
-	 if ((littleEndian && dstFormat == MESA_FORMAT_AL88) ||
-	     (!littleEndian && dstFormat == MESA_FORMAT_AL88_REV)) {
+      if (dstFormat == MESA_FORMAT_L8A8_UNORM || dstFormat == MESA_FORMAT_A8L8_UNORM) {
+	 if ((littleEndian && dstFormat == MESA_FORMAT_L8A8_UNORM) ||
+	     (!littleEndian && dstFormat == MESA_FORMAT_A8L8_UNORM)) {
 	    dstmap[0] = 0;
 	    dstmap[1] = 3;
 	 }
@@ -1649,8 +1649,8 @@ _mesa_texstore_unorm88(TEXSTORE_PARAMS)
 	 }
       }
       else {
-	 if ((littleEndian && dstFormat == MESA_FORMAT_GR88) ||
-	     (!littleEndian && dstFormat == MESA_FORMAT_RG88)) {
+	 if ((littleEndian && dstFormat == MESA_FORMAT_R8G8_UNORM) ||
+	     (!littleEndian && dstFormat == MESA_FORMAT_G8R8_UNORM)) {
 	    dstmap[0] = 0;
 	    dstmap[1] = 1;
 	 }
@@ -1687,8 +1687,8 @@ _mesa_texstore_unorm88(TEXSTORE_PARAMS)
          GLubyte *dstRow = dstSlices[img];
          for (row = 0; row < srcHeight; row++) {
             GLushort *dstUS = (GLushort *) dstRow;
-            if (dstFormat == MESA_FORMAT_AL88 ||
-		dstFormat == MESA_FORMAT_GR88) {
+            if (dstFormat == MESA_FORMAT_L8A8_UNORM ||
+		dstFormat == MESA_FORMAT_R8G8_UNORM) {
                for (col = 0; col < srcWidth; col++) {
                   /* src[0] is luminance (or R), src[1] is alpha (or G) */
                  dstUS[col] = PACK_COLOR_88( src[1],
@@ -1721,10 +1721,10 @@ _mesa_texstore_unorm1616(TEXSTORE_PARAMS)
 {
    const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
 
-   ASSERT(dstFormat == MESA_FORMAT_AL1616 ||
-          dstFormat == MESA_FORMAT_AL1616_REV ||
-	  dstFormat == MESA_FORMAT_GR1616 ||
-          dstFormat == MESA_FORMAT_RG1616);
+   ASSERT(dstFormat == MESA_FORMAT_L16A16_UNORM ||
+          dstFormat == MESA_FORMAT_A16L16_UNORM ||
+	  dstFormat == MESA_FORMAT_R16G16_UNORM ||
+          dstFormat == MESA_FORMAT_G16R16_UNORM);
    ASSERT(_mesa_get_format_bytes(dstFormat) == 4);
 
    {
@@ -1744,8 +1744,8 @@ _mesa_texstore_unorm1616(TEXSTORE_PARAMS)
          GLubyte *dstRow = dstSlices[img];
          for (row = 0; row < srcHeight; row++) {
             GLuint *dstUI = (GLuint *) dstRow;
-            if (dstFormat == MESA_FORMAT_AL1616 ||
-		dstFormat == MESA_FORMAT_GR1616) {
+            if (dstFormat == MESA_FORMAT_L16A16_UNORM ||
+		dstFormat == MESA_FORMAT_R16G16_UNORM) {
                for (col = 0; col < srcWidth; col++) {
 		  GLushort l, a;
 
@@ -2346,7 +2346,7 @@ _mesa_texstore_snorm1616(TEXSTORE_PARAMS)
 
 /**
  * Store a texture in MESA_FORMAT_SIGNED_RGBX8888 or
- * MESA_FORMAT_XBGR8888_SNORM.
+ * MESA_FORMAT_R8G8B8X8_SNORM.
  */
 static GLboolean
 _mesa_texstore_signed_rgbx8888(TEXSTORE_PARAMS)
@@ -2354,7 +2354,7 @@ _mesa_texstore_signed_rgbx8888(TEXSTORE_PARAMS)
    const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
 
    ASSERT(dstFormat == MESA_FORMAT_SIGNED_RGBX8888 ||
-          dstFormat == MESA_FORMAT_XBGR8888_SNORM);
+          dstFormat == MESA_FORMAT_R8G8B8X8_SNORM);
    ASSERT(_mesa_get_format_bytes(dstFormat) == 4);
 
    {
@@ -2474,7 +2474,7 @@ _mesa_texstore_z24_s8(TEXSTORE_PARAMS)
       = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType);
    GLint img, row;
 
-   ASSERT(dstFormat == MESA_FORMAT_Z24_S8);
+   ASSERT(dstFormat == MESA_FORMAT_S8_UINT_Z24_UNORM);
    ASSERT(srcFormat == GL_DEPTH_STENCIL_EXT ||
           srcFormat == GL_DEPTH_COMPONENT ||
           srcFormat == GL_STENCIL_INDEX);
@@ -2558,7 +2558,7 @@ _mesa_texstore_s8_z24(TEXSTORE_PARAMS)
    GLuint *depth;
    GLubyte *stencil;
 
-   ASSERT(dstFormat == MESA_FORMAT_S8_Z24);
+   ASSERT(dstFormat == MESA_FORMAT_Z24_UNORM_X8_UINT);
    ASSERT(srcFormat == GL_DEPTH_STENCIL_EXT ||
           srcFormat == GL_DEPTH_COMPONENT ||
           srcFormat == GL_STENCIL_INDEX);
@@ -3259,14 +3259,14 @@ _mesa_texstore_srgba8(TEXSTORE_PARAMS)
    mesa_format newDstFormat;
    GLboolean k;
 
-   ASSERT(dstFormat == MESA_FORMAT_SRGBA8 ||
-          dstFormat == MESA_FORMAT_XBGR8888_SRGB);
+   ASSERT(dstFormat == MESA_FORMAT_A8B8G8R8_SRGB ||
+          dstFormat == MESA_FORMAT_R8G8B8X8_SRGB);
 
    /* reuse normal rgba texstore code */
-   if (dstFormat == MESA_FORMAT_SRGBA8) {
+   if (dstFormat == MESA_FORMAT_A8B8G8R8_SRGB) {
       newDstFormat = MESA_FORMAT_A8B8G8R8_UNORM;
    }
-   else if (dstFormat == MESA_FORMAT_XBGR8888_SRGB) {
+   else if (dstFormat == MESA_FORMAT_R8G8B8X8_SRGB) {
       newDstFormat = MESA_FORMAT_R8G8B8X8_UNORM;
    }
    else {
@@ -3290,7 +3290,7 @@ _mesa_texstore_sargb8(TEXSTORE_PARAMS)
    mesa_format newDstFormat;
    GLboolean k;
 
-   ASSERT(dstFormat == MESA_FORMAT_SARGB8);
+   ASSERT(dstFormat == MESA_FORMAT_B8G8R8A8_SRGB);
 
    /* reuse normal rgba texstore code */
    newDstFormat = MESA_FORMAT_B8G8R8A8_UNORM;
@@ -3332,10 +3332,10 @@ _mesa_texstore_sla8(TEXSTORE_PARAMS)
    mesa_format newDstFormat;
    GLboolean k;
 
-   ASSERT(dstFormat == MESA_FORMAT_SLA8);
+   ASSERT(dstFormat == MESA_FORMAT_L8A8_SRGB);
 
    /* reuse normal luminance/alpha texstore code */
-   newDstFormat = MESA_FORMAT_AL88;
+   newDstFormat = MESA_FORMAT_L8A8_UNORM;
 
    k = _mesa_texstore_unorm88(ctx, dims, baseInternalFormat,
 			      newDstFormat,
@@ -3351,7 +3351,7 @@ _mesa_texstore_rgb9_e5(TEXSTORE_PARAMS)
 {
    const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
 
-   ASSERT(dstFormat == MESA_FORMAT_RGB9_E5_FLOAT);
+   ASSERT(dstFormat == MESA_FORMAT_R9G9B9E5_FLOAT);
    ASSERT(baseInternalFormat == GL_RGB);
 
    {
@@ -3389,7 +3389,7 @@ _mesa_texstore_r11_g11_b10f(TEXSTORE_PARAMS)
 {
    const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
 
-   ASSERT(dstFormat == MESA_FORMAT_R11_G11_B10_FLOAT);
+   ASSERT(dstFormat == MESA_FORMAT_R11G11B10_FLOAT);
    ASSERT(baseInternalFormat == GL_RGB);
 
    {
@@ -3426,7 +3426,7 @@ _mesa_texstore_r11_g11_b10f(TEXSTORE_PARAMS)
 static GLboolean
 _mesa_texstore_z32f_x24s8(TEXSTORE_PARAMS)
 {
-   ASSERT(dstFormat == MESA_FORMAT_Z32_FLOAT_X24S8);
+   ASSERT(dstFormat == MESA_FORMAT_Z32_FLOAT_S8X24_UINT);
    ASSERT(srcFormat == GL_DEPTH_STENCIL ||
           srcFormat == GL_DEPTH_COMPONENT ||
           srcFormat == GL_STENCIL_INDEX);
@@ -3479,7 +3479,7 @@ _mesa_texstore_argb2101010_uint(TEXSTORE_PARAMS)
 {
    const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
 
-   ASSERT(dstFormat == MESA_FORMAT_ARGB2101010_UINT);
+   ASSERT(dstFormat == MESA_FORMAT_B10G10R10A2_UINT);
    ASSERT(_mesa_get_format_bytes(dstFormat) == 4);
 
    {
@@ -3535,7 +3535,7 @@ _mesa_texstore_abgr2101010_uint(TEXSTORE_PARAMS)
 {
    const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
 
-   ASSERT(dstFormat == MESA_FORMAT_ABGR2101010_UINT);
+   ASSERT(dstFormat == MESA_FORMAT_R10G10B10A2_UINT);
    ASSERT(_mesa_get_format_bytes(dstFormat) == 4);
 
    {
@@ -3591,7 +3591,7 @@ _mesa_texstore_abgr2101010(TEXSTORE_PARAMS)
 {
    const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
 
-   ASSERT(dstFormat == MESA_FORMAT_ABGR2101010);
+   ASSERT(dstFormat == MESA_FORMAT_R10G10B10A2_UNORM);
    ASSERT(_mesa_get_format_bytes(dstFormat) == 4);
 
    {
@@ -3670,19 +3670,19 @@ _mesa_get_texstore_func(mesa_format format)
       table[MESA_FORMAT_X8R8G8B8_UNORM] = _mesa_texstore_argb8888;
       table[MESA_FORMAT_BGR_UNORM8] = _mesa_texstore_rgb888;
       table[MESA_FORMAT_RGB_UNORM8] = _mesa_texstore_bgr888;
-      table[MESA_FORMAT_RGB565] = _mesa_texstore_rgb565;
-      table[MESA_FORMAT_RGB565_REV] = _mesa_texstore_rgb565;
-      table[MESA_FORMAT_ARGB4444] = store_ubyte_texture;
-      table[MESA_FORMAT_ARGB4444_REV] = store_ubyte_texture;
-      table[MESA_FORMAT_RGBA5551] = store_ubyte_texture;
-      table[MESA_FORMAT_ARGB1555] = store_ubyte_texture;
-      table[MESA_FORMAT_ARGB1555_REV] = store_ubyte_texture;
-      table[MESA_FORMAT_AL44] = _mesa_texstore_unorm44;
-      table[MESA_FORMAT_AL88] = _mesa_texstore_unorm88;
-      table[MESA_FORMAT_AL88_REV] = _mesa_texstore_unorm88;
-      table[MESA_FORMAT_AL1616] = _mesa_texstore_unorm1616;
-      table[MESA_FORMAT_AL1616_REV] = _mesa_texstore_unorm1616;
-      table[MESA_FORMAT_RGB332] = store_ubyte_texture;
+      table[MESA_FORMAT_B5G6R5_UNORM] = _mesa_texstore_rgb565;
+      table[MESA_FORMAT_R5G6B5_UNORM] = _mesa_texstore_rgb565;
+      table[MESA_FORMAT_B4G4R4A4_UNORM] = store_ubyte_texture;
+      table[MESA_FORMAT_A4R4G4B4_UNORM] = store_ubyte_texture;
+      table[MESA_FORMAT_A1B5G5R5_UNORM] = store_ubyte_texture;
+      table[MESA_FORMAT_B5G5R5A1_UNORM] = store_ubyte_texture;
+      table[MESA_FORMAT_A1R5G5B5_UNORM] = store_ubyte_texture;
+      table[MESA_FORMAT_L4A4_UNORM] = _mesa_texstore_unorm44;
+      table[MESA_FORMAT_L8A8_UNORM] = _mesa_texstore_unorm88;
+      table[MESA_FORMAT_A8L8_UNORM] = _mesa_texstore_unorm88;
+      table[MESA_FORMAT_L16A16_UNORM] = _mesa_texstore_unorm1616;
+      table[MESA_FORMAT_A16L16_UNORM] = _mesa_texstore_unorm1616;
+      table[MESA_FORMAT_B2G3R3_UNORM] = store_ubyte_texture;
       table[MESA_FORMAT_A_UNORM8] = _mesa_texstore_unorm8;
       table[MESA_FORMAT_A_UNORM16] = _mesa_texstore_unorm16;
       table[MESA_FORMAT_L_UNORM8] = _mesa_texstore_unorm8;
@@ -3692,24 +3692,24 @@ _mesa_get_texstore_func(mesa_format format)
       table[MESA_FORMAT_YCBCR] = _mesa_texstore_ycbcr;
       table[MESA_FORMAT_YCBCR_REV] = _mesa_texstore_ycbcr;
       table[MESA_FORMAT_R_UNORM8] = _mesa_texstore_unorm8;
-      table[MESA_FORMAT_GR88] = _mesa_texstore_unorm88;
-      table[MESA_FORMAT_RG88] = _mesa_texstore_unorm88;
+      table[MESA_FORMAT_R8G8_UNORM] = _mesa_texstore_unorm88;
+      table[MESA_FORMAT_G8R8_UNORM] = _mesa_texstore_unorm88;
       table[MESA_FORMAT_R_UNORM16] = _mesa_texstore_unorm16;
-      table[MESA_FORMAT_GR1616] = _mesa_texstore_unorm1616;
-      table[MESA_FORMAT_RG1616] = _mesa_texstore_unorm1616;
-      table[MESA_FORMAT_ARGB2101010] = _mesa_texstore_argb2101010;
-      table[MESA_FORMAT_Z24_S8] = _mesa_texstore_z24_s8;
-      table[MESA_FORMAT_S8_Z24] = _mesa_texstore_s8_z24;
+      table[MESA_FORMAT_R16G16_UNORM] = _mesa_texstore_unorm1616;
+      table[MESA_FORMAT_G16R16_UNORM] = _mesa_texstore_unorm1616;
+      table[MESA_FORMAT_B10G10R10A2_UNORM] = _mesa_texstore_argb2101010;
+      table[MESA_FORMAT_S8_UINT_Z24_UNORM] = _mesa_texstore_z24_s8;
+      table[MESA_FORMAT_Z24_UNORM_X8_UINT] = _mesa_texstore_s8_z24;
       table[MESA_FORMAT_Z_UNORM16] = _mesa_texstore_z16;
-      table[MESA_FORMAT_X8_Z24] = _mesa_texstore_x8_z24;
-      table[MESA_FORMAT_Z24_X8] = _mesa_texstore_z24_x8;
+      table[MESA_FORMAT_Z24_UNORM_S8_UINT] = _mesa_texstore_x8_z24;
+      table[MESA_FORMAT_X8Z24_UNORM] = _mesa_texstore_z24_x8;
       table[MESA_FORMAT_Z_UNORM32] = _mesa_texstore_z32;
       table[MESA_FORMAT_S_UINT8] = _mesa_texstore_s8;
       table[MESA_FORMAT_BGR_SRGB8] = _mesa_texstore_srgb8;
-      table[MESA_FORMAT_SRGBA8] = _mesa_texstore_srgba8;
-      table[MESA_FORMAT_SARGB8] = _mesa_texstore_sargb8;
+      table[MESA_FORMAT_A8B8G8R8_SRGB] = _mesa_texstore_srgba8;
+      table[MESA_FORMAT_B8G8R8A8_SRGB] = _mesa_texstore_sargb8;
       table[MESA_FORMAT_L_SRGB8] = _mesa_texstore_sl8;
-      table[MESA_FORMAT_SLA8] = _mesa_texstore_sla8;
+      table[MESA_FORMAT_L8A8_SRGB] = _mesa_texstore_sla8;
       table[MESA_FORMAT_SRGB_DXT1] = _mesa_texstore_rgb_dxt1;
       table[MESA_FORMAT_SRGBA_DXT1] = _mesa_texstore_rgba_dxt1;
       table[MESA_FORMAT_SRGBA_DXT3] = _mesa_texstore_rgba_dxt3;
@@ -3776,10 +3776,10 @@ _mesa_get_texstore_func(mesa_format format)
       table[MESA_FORMAT_SIGNED_L16] = _mesa_texstore_snorm16;
       table[MESA_FORMAT_SIGNED_AL1616] = _mesa_texstore_snorm1616;
       table[MESA_FORMAT_SIGNED_I16] = _mesa_texstore_snorm16;
-      table[MESA_FORMAT_RGB9_E5_FLOAT] = _mesa_texstore_rgb9_e5;
-      table[MESA_FORMAT_R11_G11_B10_FLOAT] = _mesa_texstore_r11_g11_b10f;
+      table[MESA_FORMAT_R9G9B9E5_FLOAT] = _mesa_texstore_rgb9_e5;
+      table[MESA_FORMAT_R11G11B10_FLOAT] = _mesa_texstore_r11_g11_b10f;
       table[MESA_FORMAT_Z_FLOAT32] = _mesa_texstore_z32;
-      table[MESA_FORMAT_Z32_FLOAT_X24S8] = _mesa_texstore_z32f_x24s8;
+      table[MESA_FORMAT_Z32_FLOAT_S8X24_UINT] = _mesa_texstore_z32f_x24s8;
 
       table[MESA_FORMAT_ALPHA_UINT8] = _mesa_texstore_rgba_uint8;
       table[MESA_FORMAT_ALPHA_UINT16] = _mesa_texstore_rgba_uint16;
@@ -3835,16 +3835,16 @@ _mesa_get_texstore_func(mesa_format format)
       table[MESA_FORMAT_RGB_UINT32] = _mesa_texstore_rgba_uint32;
       table[MESA_FORMAT_RGBA_UINT32] = _mesa_texstore_rgba_uint32;
 
-      table[MESA_FORMAT_ARGB2101010_UINT] = _mesa_texstore_argb2101010_uint;
-      table[MESA_FORMAT_ABGR2101010_UINT] = _mesa_texstore_abgr2101010_uint;
+      table[MESA_FORMAT_B10G10R10A2_UINT] = _mesa_texstore_argb2101010_uint;
+      table[MESA_FORMAT_R10G10B10A2_UINT] = _mesa_texstore_abgr2101010_uint;
 
-      table[MESA_FORMAT_XRGB4444_UNORM] = store_ubyte_texture;
-      table[MESA_FORMAT_XRGB1555_UNORM] = store_ubyte_texture;
-      table[MESA_FORMAT_XBGR8888_SNORM] = _mesa_texstore_signed_rgbx8888;
-      table[MESA_FORMAT_XBGR8888_SRGB] = _mesa_texstore_srgba8;
+      table[MESA_FORMAT_B4G4R4X4_UNORM] = store_ubyte_texture;
+      table[MESA_FORMAT_B5G5R5X1_UNORM] = store_ubyte_texture;
+      table[MESA_FORMAT_R8G8B8X8_SNORM] = _mesa_texstore_signed_rgbx8888;
+      table[MESA_FORMAT_R8G8B8X8_SRGB] = _mesa_texstore_srgba8;
       table[MESA_FORMAT_RGBX_UINT8] = _mesa_texstore_rgba_uint8;
       table[MESA_FORMAT_RGBX_SINT8] = _mesa_texstore_rgba_int8;
-      table[MESA_FORMAT_XRGB2101010_UNORM] = _mesa_texstore_argb2101010;
+      table[MESA_FORMAT_B10G10R10X2_UNORM] = _mesa_texstore_argb2101010;
       table[MESA_FORMAT_RGBX_UNORM16] = _mesa_texstore_rgba_16;
       table[MESA_FORMAT_RGBX_SNORM16] = _mesa_texstore_signed_rgba_16;
       table[MESA_FORMAT_RGBX_FLOAT16] = _mesa_texstore_rgba_float16;
@@ -3854,7 +3854,7 @@ _mesa_get_texstore_func(mesa_format format)
       table[MESA_FORMAT_RGBX_UINT32] = _mesa_texstore_rgba_uint32;
       table[MESA_FORMAT_RGBX_SINT32] = _mesa_texstore_rgba_int32;
 
-      table[MESA_FORMAT_ABGR2101010] = _mesa_texstore_abgr2101010;
+      table[MESA_FORMAT_R10G10B10A2_UNORM] = _mesa_texstore_abgr2101010;
 
       table[MESA_FORMAT_SIGNED_RG88] = _mesa_texstore_snorm88;
       table[MESA_FORMAT_SIGNED_RG1616] = _mesa_texstore_snorm1616;