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'

1 files changed, 40 insertions, 40 deletions

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 7137c5fc9c5..45102242c73 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -343,51 +343,51 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       return MESA_FORMAT_SRGBA_DXT5;
 
    case GL_ALPHA16F_ARB:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A_FLOAT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
       break;
    case GL_ALPHA32F_ARB:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A_FLOAT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A_FLOAT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
       break;
    case GL_LUMINANCE16F_ARB:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L_FLOAT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
       break;
    case GL_LUMINANCE32F_ARB:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L_FLOAT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L_FLOAT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
       break;
    case GL_LUMINANCE_ALPHA16F_ARB:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LA_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LA_FLOAT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
       break;
    case GL_LUMINANCE_ALPHA32F_ARB:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LA_FLOAT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LA_FLOAT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
       break;
    case GL_INTENSITY16F_ARB:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_I_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_I_FLOAT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
       break;
    case GL_INTENSITY32F_ARB:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_I_FLOAT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_I_FLOAT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
       break;
    case GL_RGB16F_ARB:
@@ -562,99 +562,99 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       break;
 
    case GL_ALPHA8UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_UINT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A_UINT8);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);
       break;
    case GL_ALPHA16UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_UINT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A_UINT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16);
       break;
    case GL_ALPHA32UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_UINT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A_UINT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
       break;
    case GL_ALPHA8I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A_SINT8);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
       break;
    case GL_ALPHA16I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A_SINT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
       break;
    case GL_ALPHA32I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A_SINT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
       break;
    case GL_LUMINANCE8UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_UINT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L_UINT8);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);
       break;
    case GL_LUMINANCE16UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_UINT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L_UINT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16);
       break;
    case GL_LUMINANCE32UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_UINT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L_UINT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
       break;
    case GL_LUMINANCE8I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L_SINT8);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
       break;
    case GL_LUMINANCE16I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L_SINT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
       break;
    case GL_LUMINANCE32I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L_SINT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
       break;
    case GL_LUMINANCE_ALPHA8UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_UINT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LA_UINT8);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);
       break;
    case GL_LUMINANCE_ALPHA16UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_UINT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LA_UINT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16);
       break;
    case GL_LUMINANCE_ALPHA32UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_UINT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LA_UINT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
       break;
    case GL_LUMINANCE_ALPHA8I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LA_SINT8);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
       break;
    case GL_LUMINANCE_ALPHA16I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LA_SINT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
       break;
    case GL_LUMINANCE_ALPHA32I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LA_SINT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
       break;
    case GL_INTENSITY8UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_UINT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_I_UINT8);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);
       break;
    case GL_INTENSITY16UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_UINT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_I_UINT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16);
       break;
    case GL_INTENSITY32UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_UINT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_I_UINT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
       break;
    case GL_INTENSITY8I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_I_SINT8);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
       break;
    case GL_INTENSITY16I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_I_SINT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
       break;
    case GL_INTENSITY32I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_I_SINT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
       break;