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, 54 insertions, 54 deletions

diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index 021fdb462de..a4fafbee0db 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -73,21 +73,21 @@ st_mesa_format_to_pipe_format(mesa_format mesaFormat)
       return PIPE_FORMAT_BGRX8888_UNORM;
    case MESA_FORMAT_X8R8G8B8_UNORM:
       return PIPE_FORMAT_XRGB8888_UNORM;
-   case MESA_FORMAT_ARGB1555:
+   case MESA_FORMAT_B5G5R5A1_UNORM:
       return PIPE_FORMAT_B5G5R5A1_UNORM;
-   case MESA_FORMAT_ARGB4444:
+   case MESA_FORMAT_B4G4R4A4_UNORM:
       return PIPE_FORMAT_B4G4R4A4_UNORM;
-   case MESA_FORMAT_RGB565:
+   case MESA_FORMAT_B5G6R5_UNORM:
       return PIPE_FORMAT_B5G6R5_UNORM;
-   case MESA_FORMAT_RGB332:
+   case MESA_FORMAT_B2G3R3_UNORM:
       return PIPE_FORMAT_B2G3R3_UNORM;
-   case MESA_FORMAT_ARGB2101010:
+   case MESA_FORMAT_B10G10R10A2_UNORM:
       return PIPE_FORMAT_B10G10R10A2_UNORM;
-   case MESA_FORMAT_AL44:
+   case MESA_FORMAT_L4A4_UNORM:
       return PIPE_FORMAT_L4A4_UNORM;
-   case MESA_FORMAT_AL88:
+   case MESA_FORMAT_L8A8_UNORM:
       return PIPE_FORMAT_L8A8_UNORM;
-   case MESA_FORMAT_AL1616:
+   case MESA_FORMAT_L16A16_UNORM:
       return PIPE_FORMAT_L16A16_UNORM;
    case MESA_FORMAT_A_UNORM8:
       return PIPE_FORMAT_A8_UNORM;
@@ -105,19 +105,19 @@ st_mesa_format_to_pipe_format(mesa_format mesaFormat)
       return PIPE_FORMAT_Z16_UNORM;
    case MESA_FORMAT_Z_UNORM32:
       return PIPE_FORMAT_Z32_UNORM;
-   case MESA_FORMAT_Z24_S8:
+   case MESA_FORMAT_S8_UINT_Z24_UNORM:
       return PIPE_FORMAT_S8_UINT_Z24_UNORM;
-   case MESA_FORMAT_S8_Z24:
+   case MESA_FORMAT_Z24_UNORM_X8_UINT:
       return PIPE_FORMAT_Z24_UNORM_S8_UINT;
-   case MESA_FORMAT_Z24_X8:
+   case MESA_FORMAT_X8Z24_UNORM:
       return PIPE_FORMAT_X8Z24_UNORM;
-   case MESA_FORMAT_X8_Z24:
+   case MESA_FORMAT_Z24_UNORM_S8_UINT:
       return PIPE_FORMAT_Z24X8_UNORM;
    case MESA_FORMAT_S_UINT8:
       return PIPE_FORMAT_S8_UINT;
    case MESA_FORMAT_Z_FLOAT32:
       return PIPE_FORMAT_Z32_FLOAT;
-   case MESA_FORMAT_Z32_FLOAT_X24S8:
+   case MESA_FORMAT_Z32_FLOAT_S8X24_UINT:
       return PIPE_FORMAT_Z32_FLOAT_S8X24_UINT;
    case MESA_FORMAT_YCBCR:
       return PIPE_FORMAT_UYVY;
@@ -137,15 +137,15 @@ st_mesa_format_to_pipe_format(mesa_format mesaFormat)
       return PIPE_FORMAT_DXT3_SRGBA;
    case MESA_FORMAT_SRGBA_DXT5:
       return PIPE_FORMAT_DXT5_SRGBA;
-   case MESA_FORMAT_SLA8:
+   case MESA_FORMAT_L8A8_SRGB:
       return PIPE_FORMAT_L8A8_SRGB;
    case MESA_FORMAT_L_SRGB8:
       return PIPE_FORMAT_L8_SRGB;
    case MESA_FORMAT_BGR_SRGB8:
       return PIPE_FORMAT_R8G8B8_SRGB;
-   case MESA_FORMAT_SRGBA8:
+   case MESA_FORMAT_A8B8G8R8_SRGB:
       return PIPE_FORMAT_A8B8G8R8_SRGB;
-   case MESA_FORMAT_SARGB8:
+   case MESA_FORMAT_B8G8R8A8_SRGB:
       return PIPE_FORMAT_B8G8R8A8_SRGB;
    case MESA_FORMAT_RGBA_FLOAT32:
       return PIPE_FORMAT_R32G32B32A32_FLOAT;
@@ -184,9 +184,9 @@ st_mesa_format_to_pipe_format(mesa_format mesaFormat)
       return PIPE_FORMAT_R8_UNORM;
    case MESA_FORMAT_R_UNORM16:
       return PIPE_FORMAT_R16_UNORM;
-   case MESA_FORMAT_GR88:
+   case MESA_FORMAT_R8G8_UNORM:
       return PIPE_FORMAT_R8G8_UNORM;
-   case MESA_FORMAT_GR1616:
+   case MESA_FORMAT_R16G16_UNORM:
       return PIPE_FORMAT_R16G16_UNORM;
    case MESA_FORMAT_RGBA_UNORM16:
       return PIPE_FORMAT_R16G16B16A16_UNORM;
@@ -353,28 +353,28 @@ st_mesa_format_to_pipe_format(mesa_format mesaFormat)
    case MESA_FORMAT_SIGNED_I16:
       return PIPE_FORMAT_I16_SNORM;
 
-   case MESA_FORMAT_RGB9_E5_FLOAT:
+   case MESA_FORMAT_R9G9B9E5_FLOAT:
       return PIPE_FORMAT_R9G9B9E5_FLOAT;
-   case MESA_FORMAT_R11_G11_B10_FLOAT:
+   case MESA_FORMAT_R11G11B10_FLOAT:
       return PIPE_FORMAT_R11G11B10_FLOAT;
-   case MESA_FORMAT_ARGB2101010_UINT:
+   case MESA_FORMAT_B10G10R10A2_UINT:
       return PIPE_FORMAT_B10G10R10A2_UINT;
-   case MESA_FORMAT_ABGR2101010_UINT:
+   case MESA_FORMAT_R10G10B10A2_UINT:
       return PIPE_FORMAT_R10G10B10A2_UINT;
 
-   case MESA_FORMAT_XRGB4444_UNORM:
+   case MESA_FORMAT_B4G4R4X4_UNORM:
       return PIPE_FORMAT_B4G4R4X4_UNORM;
-   case MESA_FORMAT_XRGB1555_UNORM:
+   case MESA_FORMAT_B5G5R5X1_UNORM:
       return PIPE_FORMAT_B5G5R5X1_UNORM;
-   case MESA_FORMAT_XBGR8888_SNORM:
+   case MESA_FORMAT_R8G8B8X8_SNORM:
       return PIPE_FORMAT_R8G8B8X8_SNORM;
-   case MESA_FORMAT_XBGR8888_SRGB:
+   case MESA_FORMAT_R8G8B8X8_SRGB:
       return PIPE_FORMAT_R8G8B8X8_SRGB;
    case MESA_FORMAT_RGBX_UINT8:
       return PIPE_FORMAT_R8G8B8X8_UINT;
    case MESA_FORMAT_RGBX_SINT8:
       return PIPE_FORMAT_R8G8B8X8_SINT;
-   case MESA_FORMAT_XRGB2101010_UNORM:
+   case MESA_FORMAT_B10G10R10X2_UNORM:
       return PIPE_FORMAT_B10G10R10X2_UNORM;
    case MESA_FORMAT_RGBX_UNORM16:
       return PIPE_FORMAT_R16G16B16X16_UNORM;
@@ -423,21 +423,21 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
    case PIPE_FORMAT_XRGB8888_UNORM:
       return MESA_FORMAT_X8R8G8B8_UNORM;
    case PIPE_FORMAT_B5G5R5A1_UNORM:
-      return MESA_FORMAT_ARGB1555;
+      return MESA_FORMAT_B5G5R5A1_UNORM;
    case PIPE_FORMAT_B4G4R4A4_UNORM:
-      return MESA_FORMAT_ARGB4444;
+      return MESA_FORMAT_B4G4R4A4_UNORM;
    case PIPE_FORMAT_B5G6R5_UNORM:
-      return MESA_FORMAT_RGB565;
+      return MESA_FORMAT_B5G6R5_UNORM;
    case PIPE_FORMAT_B2G3R3_UNORM:
-      return MESA_FORMAT_RGB332;
+      return MESA_FORMAT_B2G3R3_UNORM;
    case PIPE_FORMAT_B10G10R10A2_UNORM:
-      return MESA_FORMAT_ARGB2101010;
+      return MESA_FORMAT_B10G10R10A2_UNORM;
    case PIPE_FORMAT_L4A4_UNORM:
-      return MESA_FORMAT_AL44;
+      return MESA_FORMAT_L4A4_UNORM;
    case PIPE_FORMAT_L8A8_UNORM:
-      return MESA_FORMAT_AL88;
+      return MESA_FORMAT_L8A8_UNORM;
    case PIPE_FORMAT_L16A16_UNORM:
-      return MESA_FORMAT_AL1616;
+      return MESA_FORMAT_L16A16_UNORM;
    case PIPE_FORMAT_A8_UNORM:
       return MESA_FORMAT_A_UNORM8;
    case PIPE_FORMAT_A16_UNORM:
@@ -461,17 +461,17 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
    case PIPE_FORMAT_Z32_UNORM:
       return MESA_FORMAT_Z_UNORM32;
    case PIPE_FORMAT_S8_UINT_Z24_UNORM:
-      return MESA_FORMAT_Z24_S8;
+      return MESA_FORMAT_S8_UINT_Z24_UNORM;
    case PIPE_FORMAT_X8Z24_UNORM:
-      return MESA_FORMAT_Z24_X8;
+      return MESA_FORMAT_X8Z24_UNORM;
    case PIPE_FORMAT_Z24X8_UNORM:
-      return MESA_FORMAT_X8_Z24;
+      return MESA_FORMAT_Z24_UNORM_S8_UINT;
    case PIPE_FORMAT_Z24_UNORM_S8_UINT:
-      return MESA_FORMAT_S8_Z24;
+      return MESA_FORMAT_Z24_UNORM_X8_UINT;
    case PIPE_FORMAT_Z32_FLOAT:
       return MESA_FORMAT_Z_FLOAT32;
    case PIPE_FORMAT_Z32_FLOAT_S8X24_UINT:
-      return MESA_FORMAT_Z32_FLOAT_X24S8;
+      return MESA_FORMAT_Z32_FLOAT_S8X24_UINT;
 
    case PIPE_FORMAT_UYVY:
       return MESA_FORMAT_YCBCR;
@@ -495,15 +495,15 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
    case PIPE_FORMAT_DXT5_SRGBA:
       return MESA_FORMAT_SRGBA_DXT5;
    case PIPE_FORMAT_L8A8_SRGB:
-      return MESA_FORMAT_SLA8;
+      return MESA_FORMAT_L8A8_SRGB;
    case PIPE_FORMAT_L8_SRGB:
       return MESA_FORMAT_L_SRGB8;
    case PIPE_FORMAT_R8G8B8_SRGB:
       return MESA_FORMAT_BGR_SRGB8;
    case PIPE_FORMAT_A8B8G8R8_SRGB:
-      return MESA_FORMAT_SRGBA8;
+      return MESA_FORMAT_A8B8G8R8_SRGB;
    case PIPE_FORMAT_B8G8R8A8_SRGB:
-      return MESA_FORMAT_SARGB8;
+      return MESA_FORMAT_B8G8R8A8_SRGB;
    case PIPE_FORMAT_R32G32B32A32_FLOAT:
       return MESA_FORMAT_RGBA_FLOAT32;
    case PIPE_FORMAT_R16G16B16A16_FLOAT:
@@ -542,9 +542,9 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
    case PIPE_FORMAT_R16_UNORM:
       return MESA_FORMAT_R_UNORM16;
    case PIPE_FORMAT_R8G8_UNORM:
-      return MESA_FORMAT_GR88;
+      return MESA_FORMAT_R8G8_UNORM;
    case PIPE_FORMAT_R16G16_UNORM:
-      return MESA_FORMAT_GR1616;
+      return MESA_FORMAT_R16G16_UNORM;
 
    case PIPE_FORMAT_A8_UINT:
       return MESA_FORMAT_ALPHA_UINT8;
@@ -708,29 +708,29 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
       return MESA_FORMAT_SIGNED_I16;
 
    case PIPE_FORMAT_R9G9B9E5_FLOAT:
-      return MESA_FORMAT_RGB9_E5_FLOAT;
+      return MESA_FORMAT_R9G9B9E5_FLOAT;
    case PIPE_FORMAT_R11G11B10_FLOAT:
-      return MESA_FORMAT_R11_G11_B10_FLOAT;
+      return MESA_FORMAT_R11G11B10_FLOAT;
 
    case PIPE_FORMAT_B10G10R10A2_UINT:
-      return MESA_FORMAT_ARGB2101010_UINT;
+      return MESA_FORMAT_B10G10R10A2_UINT;
    case PIPE_FORMAT_R10G10B10A2_UINT:
-      return MESA_FORMAT_ABGR2101010_UINT;
+      return MESA_FORMAT_R10G10B10A2_UINT;
 
    case PIPE_FORMAT_B4G4R4X4_UNORM:
-      return MESA_FORMAT_XRGB4444_UNORM;
+      return MESA_FORMAT_B4G4R4X4_UNORM;
    case PIPE_FORMAT_B5G5R5X1_UNORM:
-      return MESA_FORMAT_XRGB1555_UNORM;
+      return MESA_FORMAT_B5G5R5X1_UNORM;
    case PIPE_FORMAT_R8G8B8X8_SNORM:
-      return MESA_FORMAT_XBGR8888_SNORM;
+      return MESA_FORMAT_R8G8B8X8_SNORM;
    case PIPE_FORMAT_R8G8B8X8_SRGB:
-      return MESA_FORMAT_XBGR8888_SRGB;
+      return MESA_FORMAT_R8G8B8X8_SRGB;
    case PIPE_FORMAT_R8G8B8X8_UINT:
       return MESA_FORMAT_RGBX_UINT8;
    case PIPE_FORMAT_R8G8B8X8_SINT:
       return MESA_FORMAT_RGBX_SINT8;
    case PIPE_FORMAT_B10G10R10X2_UNORM:
-      return MESA_FORMAT_XRGB2101010_UNORM;
+      return MESA_FORMAT_B10G10R10X2_UNORM;
    case PIPE_FORMAT_R16G16B16X16_UNORM:
       return MESA_FORMAT_RGBX_UNORM16;
    case PIPE_FORMAT_R16G16B16X16_SNORM: