mesa: Fix MESA_FORMAT names with ALPH, INTENSITY, and LUMINANCE

Compressed spelled out color components ALPHA, INTENSITY, and LUMINANCE to A, I, and L:
    s/MESA_FORMAT_ALPHA_UINT8\b/MESA_FORMAT_A_UINT8/g'
    s/MESA_FORMAT_ALPHA_UINT16\b/MESA_FORMAT_A_UINT16/g'
    s/MESA_FORMAT_ALPHA_UINT32\b/MESA_FORMAT_A_UINT32/g'
    s/MESA_FORMAT_ALPHA_INT32\b/MESA_FORMAT_A_SINT32/g'
    s/MESA_FORMAT_ALPHA_INT16\b/MESA_FORMAT_A_SINT16/g'
    s/MESA_FORMAT_ALPHA_INT8\b/MESA_FORMAT_A_SINT8/g'
    s/MESA_FORMAT_INTENSITY_UINT8\b/MESA_FORMAT_I_UINT8/g'
    s/MESA_FORMAT_INTENSITY_UINT16\b/MESA_FORMAT_I_UINT16/g'
    s/MESA_FORMAT_INTENSITY_UINT32\b/MESA_FORMAT_I_UINT32/g'
    s/MESA_FORMAT_INTENSITY_INT32\b/MESA_FORMAT_I_SINT32/g'
    s/MESA_FORMAT_INTENSITY_INT16\b/MESA_FORMAT_I_SINT16/g'
    s/MESA_FORMAT_INTENSITY_INT8\b/MESA_FORMAT_I_SINT8/g'
    s/MESA_FORMAT_LUMINANCE_UINT8\b/MESA_FORMAT_L_UINT8/g'
    s/MESA_FORMAT_LUMINANCE_UINT16\b/MESA_FORMAT_L_UINT16/g'
    s/MESA_FORMAT_LUMINANCE_UINT32\b/MESA_FORMAT_L_UINT32/g'
    s/MESA_FORMAT_LUMINANCE_INT32\b/MESA_FORMAT_L_SINT32/g'
    s/MESA_FORMAT_LUMINANCE_INT16\b/MESA_FORMAT_L_SINT16/g'
    s/MESA_FORMAT_LUMINANCE_INT8\b/MESA_FORMAT_L_SINT8/g'
    s/MESA_FORMAT_LUMINANCE_ALPHA_UINT8\b/MESA_FORMAT_LA_UINT8/g'
    s/MESA_FORMAT_LUMINANCE_ALPHA_UINT16\b/MESA_FORMAT_LA_UINT16/g'
    s/MESA_FORMAT_LUMINANCE_ALPHA_UINT32\b/MESA_FORMAT_LA_UINT32/g'
    s/MESA_FORMAT_LUMINANCE_ALPHA_INT32\b/MESA_FORMAT_LA_SINT32/g'
    s/MESA_FORMAT_LUMINANCE_ALPHA_INT16\b/MESA_FORMAT_LA_SINT16/g'
    s/MESA_FORMAT_LUMINANCE_ALPHA_INT8\b/MESA_FORMAT_LA_SINT8/g'
    s/MESA_FORMAT_ALPHA_FLOAT16\b/MESA_FORMAT_A_FLOAT16/g'
    s/MESA_FORMAT_ALPHA_FLOAT32\b/MESA_FORMAT_A_FLOAT32/g'
    s/MESA_FORMAT_INTESITY_FLOAT16\b/MESA_FORMAT_I_FLOAT16/g'
    s/MESA_FORMAT_INTESITY_FLOAT32\b/MESA_FORMAT_I_FLOAT32/g'
    s/MESA_FORMAT_INTENSITY_FLOAT16\b/MESA_FORMAT_I_FLOAT16/g'
    s/MESA_FORMAT_INTENSITY_FLOAT32\b/MESA_FORMAT_I_FLOAT32/g'
    s/MESA_FORMAT_LUMINANCE_FLOAT16\b/MESA_FORMAT_L_FLOAT16/g'
    s/MESA_FORMAT_LUMINANCE_FLOAT32\b/MESA_FORMAT_L_FLOAT32/g'
    s/MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16\b/MESA_FORMAT_LA_FLOAT16/g'
    s/MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32\b/MESA_FORMAT_LA_FLOAT32/g'

2 files changed, 43 insertions, 43 deletions

diff --git a/src/mesa/drivers/dri/i965/brw_surface_formats.c b/src/mesa/drivers/dri/i965/brw_surface_formats.c
index e66a99fe57f..46e04805929 100644
--- a/src/mesa/drivers/dri/i965/brw_surface_formats.c
+++ b/src/mesa/drivers/dri/i965/brw_surface_formats.c
@@ -386,46 +386,46 @@ brw_format_for_mesa_format(mesa_format mesa_format)
       [MESA_FORMAT_RGBA_FLOAT16] = BRW_SURFACEFORMAT_R16G16B16A16_FLOAT,
       [MESA_FORMAT_RGB_FLOAT32] = BRW_SURFACEFORMAT_R32G32B32_FLOAT,
       [MESA_FORMAT_RGB_FLOAT16] = BRW_SURFACEFORMAT_R16G16B16_FLOAT,
-      [MESA_FORMAT_ALPHA_FLOAT32] = BRW_SURFACEFORMAT_A32_FLOAT,
-      [MESA_FORMAT_ALPHA_FLOAT16] = BRW_SURFACEFORMAT_A16_FLOAT,
-      [MESA_FORMAT_LUMINANCE_FLOAT32] = BRW_SURFACEFORMAT_L32_FLOAT,
-      [MESA_FORMAT_LUMINANCE_FLOAT16] = BRW_SURFACEFORMAT_L16_FLOAT,
-      [MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32] = BRW_SURFACEFORMAT_L32A32_FLOAT,
-      [MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16] = BRW_SURFACEFORMAT_L16A16_FLOAT,
-      [MESA_FORMAT_INTENSITY_FLOAT32] = BRW_SURFACEFORMAT_I32_FLOAT,
-      [MESA_FORMAT_INTENSITY_FLOAT16] = BRW_SURFACEFORMAT_I16_FLOAT,
+      [MESA_FORMAT_A_FLOAT32] = BRW_SURFACEFORMAT_A32_FLOAT,
+      [MESA_FORMAT_A_FLOAT16] = BRW_SURFACEFORMAT_A16_FLOAT,
+      [MESA_FORMAT_L_FLOAT32] = BRW_SURFACEFORMAT_L32_FLOAT,
+      [MESA_FORMAT_L_FLOAT16] = BRW_SURFACEFORMAT_L16_FLOAT,
+      [MESA_FORMAT_LA_FLOAT32] = BRW_SURFACEFORMAT_L32A32_FLOAT,
+      [MESA_FORMAT_LA_FLOAT16] = BRW_SURFACEFORMAT_L16A16_FLOAT,
+      [MESA_FORMAT_I_FLOAT32] = BRW_SURFACEFORMAT_I32_FLOAT,
+      [MESA_FORMAT_I_FLOAT16] = BRW_SURFACEFORMAT_I16_FLOAT,
       [MESA_FORMAT_R_FLOAT32] = BRW_SURFACEFORMAT_R32_FLOAT,
       [MESA_FORMAT_R_FLOAT16] = BRW_SURFACEFORMAT_R16_FLOAT,
       [MESA_FORMAT_RG_FLOAT32] = BRW_SURFACEFORMAT_R32G32_FLOAT,
       [MESA_FORMAT_RG_FLOAT16] = BRW_SURFACEFORMAT_R16G16_FLOAT,
 
-      [MESA_FORMAT_ALPHA_UINT8] = 0,
-      [MESA_FORMAT_ALPHA_UINT16] = 0,
-      [MESA_FORMAT_ALPHA_UINT32] = 0,
-      [MESA_FORMAT_ALPHA_INT8] = 0,
-      [MESA_FORMAT_ALPHA_INT16] = 0,
-      [MESA_FORMAT_ALPHA_INT32] = 0,
-
-      [MESA_FORMAT_INTENSITY_UINT8] = 0,
-      [MESA_FORMAT_INTENSITY_UINT16] = 0,
-      [MESA_FORMAT_INTENSITY_UINT32] = 0,
-      [MESA_FORMAT_INTENSITY_INT8] = 0,
-      [MESA_FORMAT_INTENSITY_INT16] = 0,
-      [MESA_FORMAT_INTENSITY_INT32] = 0,
-
-      [MESA_FORMAT_LUMINANCE_UINT8] = 0,
-      [MESA_FORMAT_LUMINANCE_UINT16] = 0,
-      [MESA_FORMAT_LUMINANCE_UINT32] = 0,
-      [MESA_FORMAT_LUMINANCE_INT8] = 0,
-      [MESA_FORMAT_LUMINANCE_INT16] = 0,
-      [MESA_FORMAT_LUMINANCE_INT32] = 0,
-
-      [MESA_FORMAT_LUMINANCE_ALPHA_UINT8] = 0,
-      [MESA_FORMAT_LUMINANCE_ALPHA_UINT16] = 0,
-      [MESA_FORMAT_LUMINANCE_ALPHA_UINT32] = 0,
-      [MESA_FORMAT_LUMINANCE_ALPHA_INT8] = 0,
-      [MESA_FORMAT_LUMINANCE_ALPHA_INT16] = 0,
-      [MESA_FORMAT_LUMINANCE_ALPHA_INT32] = 0,
+      [MESA_FORMAT_A_UINT8] = 0,
+      [MESA_FORMAT_A_UINT16] = 0,
+      [MESA_FORMAT_A_UINT32] = 0,
+      [MESA_FORMAT_A_SINT8] = 0,
+      [MESA_FORMAT_A_SINT16] = 0,
+      [MESA_FORMAT_A_SINT32] = 0,
+
+      [MESA_FORMAT_I_UINT8] = 0,
+      [MESA_FORMAT_I_UINT16] = 0,
+      [MESA_FORMAT_I_UINT32] = 0,
+      [MESA_FORMAT_I_SINT8] = 0,
+      [MESA_FORMAT_I_SINT16] = 0,
+      [MESA_FORMAT_I_SINT32] = 0,
+
+      [MESA_FORMAT_L_UINT8] = 0,
+      [MESA_FORMAT_L_UINT16] = 0,
+      [MESA_FORMAT_L_UINT32] = 0,
+      [MESA_FORMAT_L_SINT8] = 0,
+      [MESA_FORMAT_L_SINT16] = 0,
+      [MESA_FORMAT_L_SINT32] = 0,
+
+      [MESA_FORMAT_LA_UINT8] = 0,
+      [MESA_FORMAT_LA_UINT16] = 0,
+      [MESA_FORMAT_LA_UINT32] = 0,
+      [MESA_FORMAT_LA_SINT8] = 0,
+      [MESA_FORMAT_LA_SINT16] = 0,
+      [MESA_FORMAT_LA_SINT32] = 0,
 
       [MESA_FORMAT_R_INT8] = BRW_SURFACEFORMAT_R8_SINT,
       [MESA_FORMAT_RG_INT8] = BRW_SURFACEFORMAT_R8G8_SINT,
diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c
index 8c717205052..acc4e8cf62f 100644
--- a/src/mesa/drivers/dri/radeon/radeon_texture.c
+++ b/src/mesa/drivers/dri/radeon/radeon_texture.c
@@ -403,21 +403,21 @@ mesa_format radeonChooseTextureFormat(struct gl_context * ctx,
 		return MESA_FORMAT_RGBA_DXT5;
 
 	case GL_ALPHA16F_ARB:
-		return MESA_FORMAT_ALPHA_FLOAT16;
+		return MESA_FORMAT_A_FLOAT16;
 	case GL_ALPHA32F_ARB:
-		return MESA_FORMAT_ALPHA_FLOAT32;
+		return MESA_FORMAT_A_FLOAT32;
 	case GL_LUMINANCE16F_ARB:
-		return MESA_FORMAT_LUMINANCE_FLOAT16;
+		return MESA_FORMAT_L_FLOAT16;
 	case GL_LUMINANCE32F_ARB:
-		return MESA_FORMAT_LUMINANCE_FLOAT32;
+		return MESA_FORMAT_L_FLOAT32;
 	case GL_LUMINANCE_ALPHA16F_ARB:
-		return MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16;
+		return MESA_FORMAT_LA_FLOAT16;
 	case GL_LUMINANCE_ALPHA32F_ARB:
-		return MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32;
+		return MESA_FORMAT_LA_FLOAT32;
 	case GL_INTENSITY16F_ARB:
-		return MESA_FORMAT_INTENSITY_FLOAT16;
+		return MESA_FORMAT_I_FLOAT16;
 	case GL_INTENSITY32F_ARB:
-		return MESA_FORMAT_INTENSITY_FLOAT32;
+		return MESA_FORMAT_I_FLOAT32;
 	case GL_RGB16F_ARB:
 		return MESA_FORMAT_RGBA_FLOAT16;
 	case GL_RGB32F_ARB: