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

diff --git a/src/mesa/drivers/dri/nouveau/nv04_surface.c b/src/mesa/drivers/dri/nouveau/nv04_surface.c
index 0d8cf3b..f2fc83e 100644
--- a/src/mesa/drivers/dri/nouveau/nv04_surface.c
+++ b/src/mesa/drivers/dri/nouveau/nv04_surface.c
@@ -40,18 +40,18 @@ swzsurf_format(mesa_format format)
 	case MESA_FORMAT_A_UNORM8:
 	case MESA_FORMAT_L_UNORM8:
 	case MESA_FORMAT_I_UNORM8:
-	case MESA_FORMAT_RGB332:
+	case MESA_FORMAT_B2G3R3_UNORM:
 		return NV04_SWIZZLED_SURFACE_FORMAT_COLOR_Y8;
 
-	case MESA_FORMAT_RGB565:
-	case MESA_FORMAT_RGB565_REV:
-	case MESA_FORMAT_ARGB4444:
-	case MESA_FORMAT_ARGB4444_REV:
-	case MESA_FORMAT_ARGB1555:
-	case MESA_FORMAT_RGBA5551:
-	case MESA_FORMAT_ARGB1555_REV:
-	case MESA_FORMAT_AL88:
-	case MESA_FORMAT_AL88_REV:
+	case MESA_FORMAT_B5G6R5_UNORM:
+	case MESA_FORMAT_R5G6B5_UNORM:
+	case MESA_FORMAT_B4G4R4A4_UNORM:
+	case MESA_FORMAT_A4R4G4B4_UNORM:
+	case MESA_FORMAT_B5G5R5A1_UNORM:
+	case MESA_FORMAT_A1B5G5R5_UNORM:
+	case MESA_FORMAT_A1R5G5B5_UNORM:
+	case MESA_FORMAT_L8A8_UNORM:
+	case MESA_FORMAT_A8L8_UNORM:
 	case MESA_FORMAT_YCBCR:
 	case MESA_FORMAT_YCBCR_REV:
 	case MESA_FORMAT_Z_UNORM16:
@@ -62,8 +62,8 @@ swzsurf_format(mesa_format format)
 	case MESA_FORMAT_B8G8R8X8_UNORM:
 	case MESA_FORMAT_B8G8R8A8_UNORM:
 	case MESA_FORMAT_A8R8G8B8_UNORM:
-	case MESA_FORMAT_S8_Z24:
-	case MESA_FORMAT_Z24_S8:
+	case MESA_FORMAT_Z24_UNORM_X8_UINT:
+	case MESA_FORMAT_S8_UINT_Z24_UNORM:
 	case MESA_FORMAT_Z_UNORM32:
 		return NV04_SWIZZLED_SURFACE_FORMAT_COLOR_A8R8G8B8;
 
@@ -79,18 +79,18 @@ surf2d_format(mesa_format format)
 	case MESA_FORMAT_A_UNORM8:
 	case MESA_FORMAT_L_UNORM8:
 	case MESA_FORMAT_I_UNORM8:
-	case MESA_FORMAT_RGB332:
+	case MESA_FORMAT_B2G3R3_UNORM:
 		return NV04_CONTEXT_SURFACES_2D_FORMAT_Y8;
 
-	case MESA_FORMAT_RGB565:
-	case MESA_FORMAT_RGB565_REV:
-	case MESA_FORMAT_ARGB4444:
-	case MESA_FORMAT_ARGB4444_REV:
-	case MESA_FORMAT_ARGB1555:
-	case MESA_FORMAT_RGBA5551:
-	case MESA_FORMAT_ARGB1555_REV:
-	case MESA_FORMAT_AL88:
-	case MESA_FORMAT_AL88_REV:
+	case MESA_FORMAT_B5G6R5_UNORM:
+	case MESA_FORMAT_R5G6B5_UNORM:
+	case MESA_FORMAT_B4G4R4A4_UNORM:
+	case MESA_FORMAT_A4R4G4B4_UNORM:
+	case MESA_FORMAT_B5G5R5A1_UNORM:
+	case MESA_FORMAT_A1B5G5R5_UNORM:
+	case MESA_FORMAT_A1R5G5B5_UNORM:
+	case MESA_FORMAT_L8A8_UNORM:
+	case MESA_FORMAT_A8L8_UNORM:
 	case MESA_FORMAT_YCBCR:
 	case MESA_FORMAT_YCBCR_REV:
 	case MESA_FORMAT_Z_UNORM16:
@@ -101,8 +101,8 @@ surf2d_format(mesa_format format)
 	case MESA_FORMAT_B8G8R8X8_UNORM:
 	case MESA_FORMAT_B8G8R8A8_UNORM:
 	case MESA_FORMAT_A8R8G8B8_UNORM:
-	case MESA_FORMAT_S8_Z24:
-	case MESA_FORMAT_Z24_S8:
+	case MESA_FORMAT_Z24_UNORM_X8_UINT:
+	case MESA_FORMAT_S8_UINT_Z24_UNORM:
 	case MESA_FORMAT_Z_UNORM32:
 		return NV04_CONTEXT_SURFACES_2D_FORMAT_Y32;
 
@@ -118,18 +118,18 @@ rect_format(mesa_format format)
 	case MESA_FORMAT_A_UNORM8:
 	case MESA_FORMAT_L_UNORM8:
 	case MESA_FORMAT_I_UNORM8:
-	case MESA_FORMAT_RGB332:
+	case MESA_FORMAT_B2G3R3_UNORM:
 		return NV04_GDI_RECTANGLE_TEXT_COLOR_FORMAT_A8R8G8B8;
 
-	case MESA_FORMAT_RGB565:
-	case MESA_FORMAT_RGB565_REV:
-	case MESA_FORMAT_ARGB4444:
-	case MESA_FORMAT_ARGB4444_REV:
-	case MESA_FORMAT_ARGB1555:
-	case MESA_FORMAT_RGBA5551:
-	case MESA_FORMAT_ARGB1555_REV:
-	case MESA_FORMAT_AL88:
-	case MESA_FORMAT_AL88_REV:
+	case MESA_FORMAT_B5G6R5_UNORM:
+	case MESA_FORMAT_R5G6B5_UNORM:
+	case MESA_FORMAT_B4G4R4A4_UNORM:
+	case MESA_FORMAT_A4R4G4B4_UNORM:
+	case MESA_FORMAT_B5G5R5A1_UNORM:
+	case MESA_FORMAT_A1B5G5R5_UNORM:
+	case MESA_FORMAT_A1R5G5B5_UNORM:
+	case MESA_FORMAT_L8A8_UNORM:
+	case MESA_FORMAT_A8L8_UNORM:
 	case MESA_FORMAT_YCBCR:
 	case MESA_FORMAT_YCBCR_REV:
 	case MESA_FORMAT_Z_UNORM16:
@@ -140,8 +140,8 @@ rect_format(mesa_format format)
 	case MESA_FORMAT_B8G8R8X8_UNORM:
 	case MESA_FORMAT_B8G8R8A8_UNORM:
 	case MESA_FORMAT_A8R8G8B8_UNORM:
-	case MESA_FORMAT_S8_Z24:
-	case MESA_FORMAT_Z24_S8:
+	case MESA_FORMAT_Z24_UNORM_X8_UINT:
+	case MESA_FORMAT_S8_UINT_Z24_UNORM:
 	case MESA_FORMAT_Z_UNORM32:
 		return NV04_GDI_RECTANGLE_TEXT_COLOR_FORMAT_A8R8G8B8;
 
@@ -157,18 +157,18 @@ sifm_format(mesa_format format)
 	case MESA_FORMAT_A_UNORM8:
 	case MESA_FORMAT_L_UNORM8:
 	case MESA_FORMAT_I_UNORM8:
-	case MESA_FORMAT_RGB332:
+	case MESA_FORMAT_B2G3R3_UNORM:
 		return NV03_SCALED_IMAGE_FROM_MEMORY_COLOR_FORMAT_AY8;
 
-	case MESA_FORMAT_RGB565:
-	case MESA_FORMAT_RGB565_REV:
-	case MESA_FORMAT_ARGB4444:
-	case MESA_FORMAT_ARGB4444_REV:
-	case MESA_FORMAT_ARGB1555:
-	case MESA_FORMAT_RGBA5551:
-	case MESA_FORMAT_ARGB1555_REV:
-	case MESA_FORMAT_AL88:
-	case MESA_FORMAT_AL88_REV:
+	case MESA_FORMAT_B5G6R5_UNORM:
+	case MESA_FORMAT_R5G6B5_UNORM:
+	case MESA_FORMAT_B4G4R4A4_UNORM:
+	case MESA_FORMAT_A4R4G4B4_UNORM:
+	case MESA_FORMAT_B5G5R5A1_UNORM:
+	case MESA_FORMAT_A1B5G5R5_UNORM:
+	case MESA_FORMAT_A1R5G5B5_UNORM:
+	case MESA_FORMAT_L8A8_UNORM:
+	case MESA_FORMAT_A8L8_UNORM:
 	case MESA_FORMAT_YCBCR:
 	case MESA_FORMAT_YCBCR_REV:
 	case MESA_FORMAT_Z_UNORM16:
@@ -179,8 +179,8 @@ sifm_format(mesa_format format)
 	case MESA_FORMAT_B8G8R8X8_UNORM:
 	case MESA_FORMAT_B8G8R8A8_UNORM:
 	case MESA_FORMAT_A8R8G8B8_UNORM:
-	case MESA_FORMAT_S8_Z24:
-	case MESA_FORMAT_Z24_S8:
+	case MESA_FORMAT_Z24_UNORM_X8_UINT:
+	case MESA_FORMAT_S8_UINT_Z24_UNORM:
 	case MESA_FORMAT_Z_UNORM32:
 		return NV03_SCALED_IMAGE_FROM_MEMORY_COLOR_FORMAT_A8R8G8B8;