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'

7 files changed, 383 insertions, 383 deletions

diff --git a/src/mesa/main/format_pack.c b/src/mesa/main/format_pack.c
index 281efc089b4..624f1a62cd2 100644
--- a/src/mesa/main/format_pack.c
+++ b/src/mesa/main/format_pack.c
@@ -1229,7 +1229,7 @@ pack_float_RGB_FLOAT16(const GLfloat src[4], void *dst)
 }
 
 
-/* MESA_FORMAT_ALPHA_FLOAT32 */
+/* MESA_FORMAT_A_FLOAT32 */
 
 static void
 pack_ubyte_ALPHA_FLOAT32(const GLubyte src[4], void *dst)
@@ -1246,7 +1246,7 @@ pack_float_ALPHA_FLOAT32(const GLfloat src[4], void *dst)
 }
 
 
-/* MESA_FORMAT_ALPHA_FLOAT16 */
+/* MESA_FORMAT_A_FLOAT16 */
 
 static void
 pack_ubyte_ALPHA_FLOAT16(const GLubyte src[4], void *dst)
@@ -1263,7 +1263,7 @@ pack_float_ALPHA_FLOAT16(const GLfloat src[4], void *dst)
 }
 
 
-/* MESA_FORMAT_LUMINANCE_FLOAT32 (and INTENSITY_FLOAT32, R_FLOAT32) */
+/* MESA_FORMAT_L_FLOAT32 (and INTENSITY_FLOAT32, R_FLOAT32) */
 
 static void
 pack_ubyte_LUMINANCE_FLOAT32(const GLubyte src[4], void *dst)
@@ -1280,7 +1280,7 @@ pack_float_LUMINANCE_FLOAT32(const GLfloat src[4], void *dst)
 }
 
 
-/* MESA_FORMAT_LUMINANCE_FLOAT16 (and INTENSITY_FLOAT16, R_FLOAT32) */
+/* MESA_FORMAT_L_FLOAT16 (and INTENSITY_FLOAT16, R_FLOAT32) */
 
 static void
 pack_ubyte_LUMINANCE_FLOAT16(const GLubyte src[4], void *dst)
@@ -1297,7 +1297,7 @@ pack_float_LUMINANCE_FLOAT16(const GLfloat src[4], void *dst)
 }
 
 
-/* MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32 */
+/* MESA_FORMAT_LA_FLOAT32 */
 
 static void
 pack_ubyte_LUMINANCE_ALPHA_FLOAT32(const GLubyte src[4], void *dst)
@@ -1316,7 +1316,7 @@ pack_float_LUMINANCE_ALPHA_FLOAT32(const GLfloat src[4], void *dst)
 }
 
 
-/* MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16 */
+/* MESA_FORMAT_LA_FLOAT16 */
 
 static void
 pack_ubyte_LUMINANCE_ALPHA_FLOAT16(const GLubyte src[4], void *dst)
@@ -1961,14 +1961,14 @@ _mesa_get_pack_ubyte_rgba_function(mesa_format format)
       table[MESA_FORMAT_RGBA_FLOAT16] = pack_ubyte_RGBA_FLOAT16;
       table[MESA_FORMAT_RGB_FLOAT32] = pack_ubyte_RGB_FLOAT32;
       table[MESA_FORMAT_RGB_FLOAT16] = pack_ubyte_RGB_FLOAT16;
-      table[MESA_FORMAT_ALPHA_FLOAT32] = pack_ubyte_ALPHA_FLOAT32;
-      table[MESA_FORMAT_ALPHA_FLOAT16] = pack_ubyte_ALPHA_FLOAT16;
-      table[MESA_FORMAT_LUMINANCE_FLOAT32] = pack_ubyte_LUMINANCE_FLOAT32;
-      table[MESA_FORMAT_LUMINANCE_FLOAT16] = pack_ubyte_LUMINANCE_FLOAT16;
-      table[MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32] = pack_ubyte_LUMINANCE_ALPHA_FLOAT32;
-      table[MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16] = pack_ubyte_LUMINANCE_ALPHA_FLOAT16;
-      table[MESA_FORMAT_INTENSITY_FLOAT32] = pack_ubyte_LUMINANCE_FLOAT32;
-      table[MESA_FORMAT_INTENSITY_FLOAT16] = pack_ubyte_LUMINANCE_FLOAT16;
+      table[MESA_FORMAT_A_FLOAT32] = pack_ubyte_ALPHA_FLOAT32;
+      table[MESA_FORMAT_A_FLOAT16] = pack_ubyte_ALPHA_FLOAT16;
+      table[MESA_FORMAT_L_FLOAT32] = pack_ubyte_LUMINANCE_FLOAT32;
+      table[MESA_FORMAT_L_FLOAT16] = pack_ubyte_LUMINANCE_FLOAT16;
+      table[MESA_FORMAT_LA_FLOAT32] = pack_ubyte_LUMINANCE_ALPHA_FLOAT32;
+      table[MESA_FORMAT_LA_FLOAT16] = pack_ubyte_LUMINANCE_ALPHA_FLOAT16;
+      table[MESA_FORMAT_I_FLOAT32] = pack_ubyte_LUMINANCE_FLOAT32;
+      table[MESA_FORMAT_I_FLOAT16] = pack_ubyte_LUMINANCE_FLOAT16;
       table[MESA_FORMAT_R_FLOAT32] = pack_ubyte_LUMINANCE_FLOAT32;
       table[MESA_FORMAT_R_FLOAT16] = pack_ubyte_LUMINANCE_FLOAT16;
       table[MESA_FORMAT_RG_FLOAT32] = pack_ubyte_RG_FLOAT32;
@@ -2124,15 +2124,15 @@ _mesa_get_pack_float_rgba_function(mesa_format format)
       table[MESA_FORMAT_RGBA_FLOAT16] = pack_float_RGBA_FLOAT16;
       table[MESA_FORMAT_RGB_FLOAT32] = pack_float_RGB_FLOAT32;
       table[MESA_FORMAT_RGB_FLOAT16] = pack_float_RGB_FLOAT16;
-      table[MESA_FORMAT_ALPHA_FLOAT32] = pack_float_ALPHA_FLOAT32;
-      table[MESA_FORMAT_ALPHA_FLOAT16] = pack_float_ALPHA_FLOAT16;
-      table[MESA_FORMAT_LUMINANCE_FLOAT32] = pack_float_LUMINANCE_FLOAT32;
-      table[MESA_FORMAT_LUMINANCE_FLOAT16] = pack_float_LUMINANCE_FLOAT16;
-      table[MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32] = pack_float_LUMINANCE_ALPHA_FLOAT32;
-      table[MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16] = pack_float_LUMINANCE_ALPHA_FLOAT16;
-
-      table[MESA_FORMAT_INTENSITY_FLOAT32] = pack_float_LUMINANCE_FLOAT32;
-      table[MESA_FORMAT_INTENSITY_FLOAT16] = pack_float_LUMINANCE_FLOAT16;
+      table[MESA_FORMAT_A_FLOAT32] = pack_float_ALPHA_FLOAT32;
+      table[MESA_FORMAT_A_FLOAT16] = pack_float_ALPHA_FLOAT16;
+      table[MESA_FORMAT_L_FLOAT32] = pack_float_LUMINANCE_FLOAT32;
+      table[MESA_FORMAT_L_FLOAT16] = pack_float_LUMINANCE_FLOAT16;
+      table[MESA_FORMAT_LA_FLOAT32] = pack_float_LUMINANCE_ALPHA_FLOAT32;
+      table[MESA_FORMAT_LA_FLOAT16] = pack_float_LUMINANCE_ALPHA_FLOAT16;
+
+      table[MESA_FORMAT_I_FLOAT32] = pack_float_LUMINANCE_FLOAT32;
+      table[MESA_FORMAT_I_FLOAT16] = pack_float_LUMINANCE_FLOAT16;
       table[MESA_FORMAT_R_FLOAT32] = pack_float_LUMINANCE_FLOAT32;
       table[MESA_FORMAT_R_FLOAT16] = pack_float_LUMINANCE_FLOAT16;
       table[MESA_FORMAT_RG_FLOAT32] = pack_float_RG_FLOAT32;
diff --git a/src/mesa/main/format_unpack.c b/src/mesa/main/format_unpack.c
index d40fb55802e..b9b8d0e2146 100644
--- a/src/mesa/main/format_unpack.c
+++ b/src/mesa/main/format_unpack.c
@@ -2387,46 +2387,46 @@ get_unpack_rgba_function(mesa_format format)
       table[MESA_FORMAT_RGBA_FLOAT16] = unpack_RGBA_FLOAT16;
       table[MESA_FORMAT_RGB_FLOAT32] = unpack_RGB_FLOAT32;
       table[MESA_FORMAT_RGB_FLOAT16] = unpack_RGB_FLOAT16;
-      table[MESA_FORMAT_ALPHA_FLOAT32] = unpack_ALPHA_FLOAT32;
-      table[MESA_FORMAT_ALPHA_FLOAT16] = unpack_ALPHA_FLOAT16;
-      table[MESA_FORMAT_LUMINANCE_FLOAT32] = unpack_LUMINANCE_FLOAT32;
-      table[MESA_FORMAT_LUMINANCE_FLOAT16] = unpack_LUMINANCE_FLOAT16;
-      table[MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32] = unpack_LUMINANCE_ALPHA_FLOAT32;
-      table[MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16] = unpack_LUMINANCE_ALPHA_FLOAT16;
-      table[MESA_FORMAT_INTENSITY_FLOAT32] = unpack_INTENSITY_FLOAT32;
-      table[MESA_FORMAT_INTENSITY_FLOAT16] = unpack_INTENSITY_FLOAT16;
+      table[MESA_FORMAT_A_FLOAT32] = unpack_ALPHA_FLOAT32;
+      table[MESA_FORMAT_A_FLOAT16] = unpack_ALPHA_FLOAT16;
+      table[MESA_FORMAT_L_FLOAT32] = unpack_LUMINANCE_FLOAT32;
+      table[MESA_FORMAT_L_FLOAT16] = unpack_LUMINANCE_FLOAT16;
+      table[MESA_FORMAT_LA_FLOAT32] = unpack_LUMINANCE_ALPHA_FLOAT32;
+      table[MESA_FORMAT_LA_FLOAT16] = unpack_LUMINANCE_ALPHA_FLOAT16;
+      table[MESA_FORMAT_I_FLOAT32] = unpack_INTENSITY_FLOAT32;
+      table[MESA_FORMAT_I_FLOAT16] = unpack_INTENSITY_FLOAT16;
       table[MESA_FORMAT_R_FLOAT32] = unpack_R_FLOAT32;
       table[MESA_FORMAT_R_FLOAT16] = unpack_R_FLOAT16;
       table[MESA_FORMAT_RG_FLOAT32] = unpack_RG_FLOAT32;
       table[MESA_FORMAT_RG_FLOAT16] = unpack_RG_FLOAT16;
 
-      table[MESA_FORMAT_ALPHA_UINT8] = unpack_ALPHA_UINT8;
-      table[MESA_FORMAT_ALPHA_UINT16] = unpack_ALPHA_UINT16;
-      table[MESA_FORMAT_ALPHA_UINT32] = unpack_ALPHA_UINT32;
-      table[MESA_FORMAT_ALPHA_INT8] = unpack_ALPHA_INT8;
-      table[MESA_FORMAT_ALPHA_INT16] = unpack_ALPHA_INT16;
-      table[MESA_FORMAT_ALPHA_INT32] = unpack_ALPHA_INT32;
-
-      table[MESA_FORMAT_INTENSITY_UINT8] = unpack_INTENSITY_UINT8;
-      table[MESA_FORMAT_INTENSITY_UINT16] = unpack_INTENSITY_UINT16;
-      table[MESA_FORMAT_INTENSITY_UINT32] = unpack_INTENSITY_UINT32;
-      table[MESA_FORMAT_INTENSITY_INT8] = unpack_INTENSITY_INT8;
-      table[MESA_FORMAT_INTENSITY_INT16] = unpack_INTENSITY_INT16;
-      table[MESA_FORMAT_INTENSITY_INT32] = unpack_INTENSITY_INT32;
-
-      table[MESA_FORMAT_LUMINANCE_UINT8] = unpack_LUMINANCE_UINT8;
-      table[MESA_FORMAT_LUMINANCE_UINT16] = unpack_LUMINANCE_UINT16;
-      table[MESA_FORMAT_LUMINANCE_UINT32] = unpack_LUMINANCE_UINT32;
-      table[MESA_FORMAT_LUMINANCE_INT8] = unpack_LUMINANCE_INT8;
-      table[MESA_FORMAT_LUMINANCE_INT16] = unpack_LUMINANCE_INT16;
-      table[MESA_FORMAT_LUMINANCE_INT32] = unpack_LUMINANCE_INT32;
-
-      table[MESA_FORMAT_LUMINANCE_ALPHA_UINT8] = unpack_LUMINANCE_ALPHA_UINT8;
-      table[MESA_FORMAT_LUMINANCE_ALPHA_UINT16] = unpack_LUMINANCE_ALPHA_UINT16;
-      table[MESA_FORMAT_LUMINANCE_ALPHA_UINT32] = unpack_LUMINANCE_ALPHA_UINT32;
-      table[MESA_FORMAT_LUMINANCE_ALPHA_INT8] = unpack_LUMINANCE_ALPHA_INT8;
-      table[MESA_FORMAT_LUMINANCE_ALPHA_INT16] = unpack_LUMINANCE_ALPHA_INT16;
-      table[MESA_FORMAT_LUMINANCE_ALPHA_INT32] = unpack_LUMINANCE_ALPHA_INT32;
+      table[MESA_FORMAT_A_UINT8] = unpack_ALPHA_UINT8;
+      table[MESA_FORMAT_A_UINT16] = unpack_ALPHA_UINT16;
+      table[MESA_FORMAT_A_UINT32] = unpack_ALPHA_UINT32;
+      table[MESA_FORMAT_A_SINT8] = unpack_ALPHA_INT8;
+      table[MESA_FORMAT_A_SINT16] = unpack_ALPHA_INT16;
+      table[MESA_FORMAT_A_SINT32] = unpack_ALPHA_INT32;
+
+      table[MESA_FORMAT_I_UINT8] = unpack_INTENSITY_UINT8;
+      table[MESA_FORMAT_I_UINT16] = unpack_INTENSITY_UINT16;
+      table[MESA_FORMAT_I_UINT32] = unpack_INTENSITY_UINT32;
+      table[MESA_FORMAT_I_SINT8] = unpack_INTENSITY_INT8;
+      table[MESA_FORMAT_I_SINT16] = unpack_INTENSITY_INT16;
+      table[MESA_FORMAT_I_SINT32] = unpack_INTENSITY_INT32;
+
+      table[MESA_FORMAT_L_UINT8] = unpack_LUMINANCE_UINT8;
+      table[MESA_FORMAT_L_UINT16] = unpack_LUMINANCE_UINT16;
+      table[MESA_FORMAT_L_UINT32] = unpack_LUMINANCE_UINT32;
+      table[MESA_FORMAT_L_SINT8] = unpack_LUMINANCE_INT8;
+      table[MESA_FORMAT_L_SINT16] = unpack_LUMINANCE_INT16;
+      table[MESA_FORMAT_L_SINT32] = unpack_LUMINANCE_INT32;
+
+      table[MESA_FORMAT_LA_UINT8] = unpack_LUMINANCE_ALPHA_UINT8;
+      table[MESA_FORMAT_LA_UINT16] = unpack_LUMINANCE_ALPHA_UINT16;
+      table[MESA_FORMAT_LA_UINT32] = unpack_LUMINANCE_ALPHA_UINT32;
+      table[MESA_FORMAT_LA_SINT8] = unpack_LUMINANCE_ALPHA_INT8;
+      table[MESA_FORMAT_LA_SINT16] = unpack_LUMINANCE_ALPHA_INT16;
+      table[MESA_FORMAT_LA_SINT32] = unpack_LUMINANCE_ALPHA_INT32;
 
       table[MESA_FORMAT_R_INT8] = unpack_R_INT8;
       table[MESA_FORMAT_RG_INT8] = unpack_RG_INT8;
@@ -3731,78 +3731,78 @@ _mesa_unpack_uint_rgba_row(mesa_format format, GLuint n,
       unpack_int_rgba_R_INT8(src, dst, n);
       break;
 
-   case MESA_FORMAT_ALPHA_UINT32:
-   case MESA_FORMAT_ALPHA_INT32:
+   case MESA_FORMAT_A_UINT32:
+   case MESA_FORMAT_A_SINT32:
       unpack_int_rgba_ALPHA_UINT32(src, dst, n);
       break;
 
-   case MESA_FORMAT_ALPHA_UINT16:
+   case MESA_FORMAT_A_UINT16:
       unpack_int_rgba_ALPHA_UINT16(src, dst, n);
       break;
-   case MESA_FORMAT_ALPHA_INT16:
+   case MESA_FORMAT_A_SINT16:
       unpack_int_rgba_ALPHA_INT16(src, dst, n);
       break;
 
-   case MESA_FORMAT_ALPHA_UINT8:
+   case MESA_FORMAT_A_UINT8:
       unpack_int_rgba_ALPHA_UINT8(src, dst, n);
       break;
-   case MESA_FORMAT_ALPHA_INT8:
+   case MESA_FORMAT_A_SINT8:
       unpack_int_rgba_ALPHA_INT8(src, dst, n);
       break;
 
-   case MESA_FORMAT_LUMINANCE_UINT32:
-   case MESA_FORMAT_LUMINANCE_INT32:
+   case MESA_FORMAT_L_UINT32:
+   case MESA_FORMAT_L_SINT32:
       unpack_int_rgba_LUMINANCE_UINT32(src, dst, n);
       break;
-   case MESA_FORMAT_LUMINANCE_UINT16:
+   case MESA_FORMAT_L_UINT16:
       unpack_int_rgba_LUMINANCE_UINT16(src, dst, n);
       break;
-   case MESA_FORMAT_LUMINANCE_INT16:
+   case MESA_FORMAT_L_SINT16:
       unpack_int_rgba_LUMINANCE_INT16(src, dst, n);
       break;
 
-   case MESA_FORMAT_LUMINANCE_UINT8:
+   case MESA_FORMAT_L_UINT8:
       unpack_int_rgba_LUMINANCE_UINT8(src, dst, n);
       break;
-   case MESA_FORMAT_LUMINANCE_INT8:
+   case MESA_FORMAT_L_SINT8:
       unpack_int_rgba_LUMINANCE_INT8(src, dst, n);
       break;
 
-   case MESA_FORMAT_LUMINANCE_ALPHA_UINT32:
-   case MESA_FORMAT_LUMINANCE_ALPHA_INT32:
+   case MESA_FORMAT_LA_UINT32:
+   case MESA_FORMAT_LA_SINT32:
       unpack_int_rgba_LUMINANCE_ALPHA_UINT32(src, dst, n);
       break;
 
-   case MESA_FORMAT_LUMINANCE_ALPHA_UINT16:
+   case MESA_FORMAT_LA_UINT16:
       unpack_int_rgba_LUMINANCE_ALPHA_UINT16(src, dst, n);
       break;
-   case MESA_FORMAT_LUMINANCE_ALPHA_INT16:
+   case MESA_FORMAT_LA_SINT16:
       unpack_int_rgba_LUMINANCE_ALPHA_INT16(src, dst, n);
       break;
 
-   case MESA_FORMAT_LUMINANCE_ALPHA_UINT8:
+   case MESA_FORMAT_LA_UINT8:
       unpack_int_rgba_LUMINANCE_ALPHA_UINT8(src, dst, n);
       break;
-   case MESA_FORMAT_LUMINANCE_ALPHA_INT8:
+   case MESA_FORMAT_LA_SINT8:
       unpack_int_rgba_LUMINANCE_ALPHA_INT8(src, dst, n);
       break;
 
-   case MESA_FORMAT_INTENSITY_UINT32:
-   case MESA_FORMAT_INTENSITY_INT32:
+   case MESA_FORMAT_I_UINT32:
+   case MESA_FORMAT_I_SINT32:
       unpack_int_rgba_INTENSITY_UINT32(src, dst, n);
       break;
 
-   case MESA_FORMAT_INTENSITY_UINT16:
+   case MESA_FORMAT_I_UINT16:
       unpack_int_rgba_INTENSITY_UINT16(src, dst, n);
       break;
-   case MESA_FORMAT_INTENSITY_INT16:
+   case MESA_FORMAT_I_SINT16:
       unpack_int_rgba_INTENSITY_INT16(src, dst, n);
       break;
 
-   case MESA_FORMAT_INTENSITY_UINT8:
+   case MESA_FORMAT_I_UINT8:
       unpack_int_rgba_INTENSITY_UINT8(src, dst, n);
       break;
-   case MESA_FORMAT_INTENSITY_INT8:
+   case MESA_FORMAT_I_SINT8:
       unpack_int_rgba_INTENSITY_INT8(src, dst, n);
       break;
 
diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index 1ca2aa3b080..fc6a3f6fd1c 100644
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -666,8 +666,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 6
    },
    {
-      MESA_FORMAT_ALPHA_FLOAT32,
-      "MESA_FORMAT_ALPHA_FLOAT32",
+      MESA_FORMAT_A_FLOAT32,
+      "MESA_FORMAT_A_FLOAT32",
       GL_ALPHA,
       GL_FLOAT,
       0, 0, 0, 32,
@@ -675,8 +675,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 4
    },
    {
-      MESA_FORMAT_ALPHA_FLOAT16,
-      "MESA_FORMAT_ALPHA_FLOAT16",
+      MESA_FORMAT_A_FLOAT16,
+      "MESA_FORMAT_A_FLOAT16",
       GL_ALPHA,
       GL_FLOAT,
       0, 0, 0, 16,
@@ -684,8 +684,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 2
    },
    {
-      MESA_FORMAT_LUMINANCE_FLOAT32,
-      "MESA_FORMAT_LUMINANCE_FLOAT32",
+      MESA_FORMAT_L_FLOAT32,
+      "MESA_FORMAT_L_FLOAT32",
       GL_LUMINANCE,
       GL_FLOAT,
       0, 0, 0, 0,
@@ -693,8 +693,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 4
    },
    {
-      MESA_FORMAT_LUMINANCE_FLOAT16,
-      "MESA_FORMAT_LUMINANCE_FLOAT16",
+      MESA_FORMAT_L_FLOAT16,
+      "MESA_FORMAT_L_FLOAT16",
       GL_LUMINANCE,
       GL_FLOAT,
       0, 0, 0, 0,
@@ -702,8 +702,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 2
    },
    {
-      MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32,
-      "MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32",
+      MESA_FORMAT_LA_FLOAT32,
+      "MESA_FORMAT_LA_FLOAT32",
       GL_LUMINANCE_ALPHA,
       GL_FLOAT,
       0, 0, 0, 32,
@@ -711,8 +711,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 8
    },
    {
-      MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16,
-      "MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16",
+      MESA_FORMAT_LA_FLOAT16,
+      "MESA_FORMAT_LA_FLOAT16",
       GL_LUMINANCE_ALPHA,
       GL_FLOAT,
       0, 0, 0, 16,
@@ -720,8 +720,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 4
    },
    {
-      MESA_FORMAT_INTENSITY_FLOAT32,
-      "MESA_FORMAT_INTENSITY_FLOAT32",
+      MESA_FORMAT_I_FLOAT32,
+      "MESA_FORMAT_I_FLOAT32",
       GL_INTENSITY,
       GL_FLOAT,
       0, 0, 0, 0,
@@ -729,8 +729,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 4
    },
    {
-      MESA_FORMAT_INTENSITY_FLOAT16,
-      "MESA_FORMAT_INTENSITY_FLOAT16",
+      MESA_FORMAT_I_FLOAT16,
+      "MESA_FORMAT_I_FLOAT16",
       GL_INTENSITY,
       GL_FLOAT,
       0, 0, 0, 0,
@@ -777,8 +777,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
    /* unnormalized signed int formats */
    /* unnormalized unsigned int formats */
    {
-      MESA_FORMAT_ALPHA_UINT8,
-      "MESA_FORMAT_ALPHA_UINT8",
+      MESA_FORMAT_A_UINT8,
+      "MESA_FORMAT_A_UINT8",
       GL_ALPHA,
       GL_UNSIGNED_INT,
       0, 0, 0, 8,
@@ -786,8 +786,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 1
    },
    {
-      MESA_FORMAT_ALPHA_UINT16,
-      "MESA_FORMAT_ALPHA_UINT16",
+      MESA_FORMAT_A_UINT16,
+      "MESA_FORMAT_A_UINT16",
       GL_ALPHA,
       GL_UNSIGNED_INT,
       0, 0, 0, 16,
@@ -795,8 +795,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 2
    },
    {
-      MESA_FORMAT_ALPHA_UINT32,
-      "MESA_FORMAT_ALPHA_UINT32",
+      MESA_FORMAT_A_UINT32,
+      "MESA_FORMAT_A_UINT32",
       GL_ALPHA,
       GL_UNSIGNED_INT,
       0, 0, 0, 32,
@@ -804,8 +804,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 4
    },
    {
-      MESA_FORMAT_ALPHA_INT8,
-      "MESA_FORMAT_ALPHA_INT8",
+      MESA_FORMAT_A_SINT8,
+      "MESA_FORMAT_A_SINT8",
       GL_ALPHA,
       GL_INT,
       0, 0, 0, 8,
@@ -813,8 +813,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 1
    },
    {
-      MESA_FORMAT_ALPHA_INT16,
-      "MESA_FORMAT_ALPHA_INT16",
+      MESA_FORMAT_A_SINT16,
+      "MESA_FORMAT_A_SINT16",
       GL_ALPHA,
       GL_INT,
       0, 0, 0, 16,
@@ -822,8 +822,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 2
    },
    {
-      MESA_FORMAT_ALPHA_INT32,
-      "MESA_FORMAT_ALPHA_INT32",
+      MESA_FORMAT_A_SINT32,
+      "MESA_FORMAT_A_SINT32",
       GL_ALPHA,
       GL_INT,
       0, 0, 0, 32,
@@ -831,8 +831,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 4
    },
    {
-      MESA_FORMAT_INTENSITY_UINT8,
-      "MESA_FORMAT_INTENSITY_UINT8",
+      MESA_FORMAT_I_UINT8,
+      "MESA_FORMAT_I_UINT8",
       GL_INTENSITY,
       GL_UNSIGNED_INT,
       0, 0, 0, 0,
@@ -840,8 +840,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 1
    },
    {
-      MESA_FORMAT_INTENSITY_UINT16,
-      "MESA_FORMAT_INTENSITY_UINT16",
+      MESA_FORMAT_I_UINT16,
+      "MESA_FORMAT_I_UINT16",
       GL_INTENSITY,
       GL_UNSIGNED_INT,
       0, 0, 0, 0,
@@ -849,8 +849,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 2
    },
    {
-      MESA_FORMAT_INTENSITY_UINT32,
-      "MESA_FORMAT_INTENSITY_UINT32",
+      MESA_FORMAT_I_UINT32,
+      "MESA_FORMAT_I_UINT32",
       GL_INTENSITY,
       GL_UNSIGNED_INT,
       0, 0, 0, 0,
@@ -858,8 +858,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 4
    },
    {
-      MESA_FORMAT_INTENSITY_INT8,
-      "MESA_FORMAT_INTENSITY_INT8",
+      MESA_FORMAT_I_SINT8,
+      "MESA_FORMAT_I_SINT8",
       GL_INTENSITY,
       GL_INT,
       0, 0, 0, 0,
@@ -867,8 +867,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 1
    },
    {
-      MESA_FORMAT_INTENSITY_INT16,
-      "MESA_FORMAT_INTENSITY_INT16",
+      MESA_FORMAT_I_SINT16,
+      "MESA_FORMAT_I_SINT16",
       GL_INTENSITY,
       GL_INT,
       0, 0, 0, 0,
@@ -876,8 +876,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 2
    },
    {
-      MESA_FORMAT_INTENSITY_INT32,
-      "MESA_FORMAT_INTENSITY_INT32",
+      MESA_FORMAT_I_SINT32,
+      "MESA_FORMAT_I_SINT32",
       GL_INTENSITY,
       GL_INT,
       0, 0, 0, 0,
@@ -885,8 +885,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 4
    },
    {
-      MESA_FORMAT_LUMINANCE_UINT8,
-      "MESA_FORMAT_LUMINANCE_UINT8",
+      MESA_FORMAT_L_UINT8,
+      "MESA_FORMAT_L_UINT8",
       GL_LUMINANCE,
       GL_UNSIGNED_INT,
       0, 0, 0, 0,
@@ -894,8 +894,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 1
    },
    {
-      MESA_FORMAT_LUMINANCE_UINT16,
-      "MESA_FORMAT_LUMINANCE_UINT16",
+      MESA_FORMAT_L_UINT16,
+      "MESA_FORMAT_L_UINT16",
       GL_LUMINANCE,
       GL_UNSIGNED_INT,
       0, 0, 0, 0,
@@ -903,8 +903,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 2
    },
    {
-      MESA_FORMAT_LUMINANCE_UINT32,
-      "MESA_FORMAT_LUMINANCE_UINT32",
+      MESA_FORMAT_L_UINT32,
+      "MESA_FORMAT_L_UINT32",
       GL_LUMINANCE,
       GL_UNSIGNED_INT,
       0, 0, 0, 0,
@@ -912,8 +912,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 4
    },
    {
-      MESA_FORMAT_LUMINANCE_INT8,
-      "MESA_FORMAT_LUMINANCE_INT8",
+      MESA_FORMAT_L_SINT8,
+      "MESA_FORMAT_L_SINT8",
       GL_LUMINANCE,
       GL_INT,
       0, 0, 0, 0,
@@ -921,8 +921,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 1
    },
    {
-      MESA_FORMAT_LUMINANCE_INT16,
-      "MESA_FORMAT_LUMINANCE_INT16",
+      MESA_FORMAT_L_SINT16,
+      "MESA_FORMAT_L_SINT16",
       GL_LUMINANCE,
       GL_INT,
       0, 0, 0, 0,
@@ -930,8 +930,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 2
    },
    {
-      MESA_FORMAT_LUMINANCE_INT32,
-      "MESA_FORMAT_LUMINANCE_INT32",
+      MESA_FORMAT_L_SINT32,
+      "MESA_FORMAT_L_SINT32",
       GL_LUMINANCE,
       GL_INT,
       0, 0, 0, 0,
@@ -939,8 +939,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 4
    },
    {
-      MESA_FORMAT_LUMINANCE_ALPHA_UINT8,
-      "MESA_FORMAT_LUMINANCE_ALPHA_UINT8",
+      MESA_FORMAT_LA_UINT8,
+      "MESA_FORMAT_LA_UINT8",
       GL_LUMINANCE_ALPHA,
       GL_UNSIGNED_INT,
       0, 0, 0, 8,
@@ -948,8 +948,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 2
    },
    {
-      MESA_FORMAT_LUMINANCE_ALPHA_UINT16,
-      "MESA_FORMAT_LUMINANCE_ALPHA_UINT16",
+      MESA_FORMAT_LA_UINT16,
+      "MESA_FORMAT_LA_UINT16",
       GL_LUMINANCE_ALPHA,
       GL_UNSIGNED_INT,
       0, 0, 0, 16,
@@ -957,8 +957,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 4
    },
    {
-      MESA_FORMAT_LUMINANCE_ALPHA_UINT32,
-      "MESA_FORMAT_LUMINANCE_ALPHA_UINT32",
+      MESA_FORMAT_LA_UINT32,
+      "MESA_FORMAT_LA_UINT32",
       GL_LUMINANCE_ALPHA,
       GL_UNSIGNED_INT,
       0, 0, 0, 32,
@@ -966,8 +966,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 8
    },
    {
-      MESA_FORMAT_LUMINANCE_ALPHA_INT8,
-      "MESA_FORMAT_LUMINANCE_ALPHA_INT8",
+      MESA_FORMAT_LA_SINT8,
+      "MESA_FORMAT_LA_SINT8",
       GL_LUMINANCE_ALPHA,
       GL_INT,
       0, 0, 0, 8,
@@ -975,8 +975,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 2
    },
    {
-      MESA_FORMAT_LUMINANCE_ALPHA_INT16,
-      "MESA_FORMAT_LUMINANCE_ALPHA_INT16",
+      MESA_FORMAT_LA_SINT16,
+      "MESA_FORMAT_LA_SINT16",
       GL_LUMINANCE_ALPHA,
       GL_INT,
       0, 0, 0, 16,
@@ -984,8 +984,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 4
    },
    {
-      MESA_FORMAT_LUMINANCE_ALPHA_INT32,
-      "MESA_FORMAT_LUMINANCE_ALPHA_INT32",
+      MESA_FORMAT_LA_SINT32,
+      "MESA_FORMAT_LA_SINT32",
       GL_LUMINANCE_ALPHA,
       GL_INT,
       0, 0, 0, 32,
@@ -2625,91 +2625,91 @@ _mesa_format_to_type_and_comps(mesa_format format,
       *datatype = GL_HALF_FLOAT_ARB;
       *comps = 3;
       return;
-   case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32:
+   case MESA_FORMAT_LA_FLOAT32:
    case MESA_FORMAT_RG_FLOAT32:
       *datatype = GL_FLOAT;
       *comps = 2;
       return;
-   case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16:
+   case MESA_FORMAT_LA_FLOAT16:
    case MESA_FORMAT_RG_FLOAT16:
       *datatype = GL_HALF_FLOAT_ARB;
       *comps = 2;
       return;
-   case MESA_FORMAT_ALPHA_FLOAT32:
-   case MESA_FORMAT_LUMINANCE_FLOAT32:
-   case MESA_FORMAT_INTENSITY_FLOAT32:
+   case MESA_FORMAT_A_FLOAT32:
+   case MESA_FORMAT_L_FLOAT32:
+   case MESA_FORMAT_I_FLOAT32:
    case MESA_FORMAT_R_FLOAT32:
       *datatype = GL_FLOAT;
       *comps = 1;
       return;
-   case MESA_FORMAT_ALPHA_FLOAT16:
-   case MESA_FORMAT_LUMINANCE_FLOAT16:
-   case MESA_FORMAT_INTENSITY_FLOAT16:
+   case MESA_FORMAT_A_FLOAT16:
+   case MESA_FORMAT_L_FLOAT16:
+   case MESA_FORMAT_I_FLOAT16:
    case MESA_FORMAT_R_FLOAT16:
       *datatype = GL_HALF_FLOAT_ARB;
       *comps = 1;
       return;
 
-   case MESA_FORMAT_ALPHA_UINT8:
-   case MESA_FORMAT_LUMINANCE_UINT8:
-   case MESA_FORMAT_INTENSITY_UINT8:
+   case MESA_FORMAT_A_UINT8:
+   case MESA_FORMAT_L_UINT8:
+   case MESA_FORMAT_I_UINT8:
       *datatype = GL_UNSIGNED_BYTE;
       *comps = 1;
       return;
-   case MESA_FORMAT_LUMINANCE_ALPHA_UINT8:
+   case MESA_FORMAT_LA_UINT8:
       *datatype = GL_UNSIGNED_BYTE;
       *comps = 2;
       return;
 
-   case MESA_FORMAT_ALPHA_UINT16:
-   case MESA_FORMAT_LUMINANCE_UINT16:
-   case MESA_FORMAT_INTENSITY_UINT16:
+   case MESA_FORMAT_A_UINT16:
+   case MESA_FORMAT_L_UINT16:
+   case MESA_FORMAT_I_UINT16:
       *datatype = GL_UNSIGNED_SHORT;
       *comps = 1;
       return;
-   case MESA_FORMAT_LUMINANCE_ALPHA_UINT16:
+   case MESA_FORMAT_LA_UINT16:
       *datatype = GL_UNSIGNED_SHORT;
       *comps = 2;
       return;
-   case MESA_FORMAT_ALPHA_UINT32:
-   case MESA_FORMAT_LUMINANCE_UINT32:
-   case MESA_FORMAT_INTENSITY_UINT32:
+   case MESA_FORMAT_A_UINT32:
+   case MESA_FORMAT_L_UINT32:
+   case MESA_FORMAT_I_UINT32:
       *datatype = GL_UNSIGNED_INT;
       *comps = 1;
       return;
-   case MESA_FORMAT_LUMINANCE_ALPHA_UINT32:
+   case MESA_FORMAT_LA_UINT32:
       *datatype = GL_UNSIGNED_INT;
       *comps = 2;
       return;
-   case MESA_FORMAT_ALPHA_INT8:
-   case MESA_FORMAT_LUMINANCE_INT8:
-   case MESA_FORMAT_INTENSITY_INT8:
+   case MESA_FORMAT_A_SINT8:
+   case MESA_FORMAT_L_SINT8:
+   case MESA_FORMAT_I_SINT8:
       *datatype = GL_BYTE;
       *comps = 1;
       return;
-   case MESA_FORMAT_LUMINANCE_ALPHA_INT8:
+   case MESA_FORMAT_LA_SINT8:
       *datatype = GL_BYTE;
       *comps = 2;
       return;
 
-   case MESA_FORMAT_ALPHA_INT16:
-   case MESA_FORMAT_LUMINANCE_INT16:
-   case MESA_FORMAT_INTENSITY_INT16:
+   case MESA_FORMAT_A_SINT16:
+   case MESA_FORMAT_L_SINT16:
+   case MESA_FORMAT_I_SINT16:
       *datatype = GL_SHORT;
       *comps = 1;
       return;
-   case MESA_FORMAT_LUMINANCE_ALPHA_INT16:
+   case MESA_FORMAT_LA_SINT16:
       *datatype = GL_SHORT;
       *comps = 2;
       return;
 
-   case MESA_FORMAT_ALPHA_INT32:
-   case MESA_FORMAT_LUMINANCE_INT32:
-   case MESA_FORMAT_INTENSITY_INT32:
+   case MESA_FORMAT_A_SINT32:
+   case MESA_FORMAT_L_SINT32:
+   case MESA_FORMAT_I_SINT32:
       *datatype = GL_INT;
       *comps = 1;
       return;
-   case MESA_FORMAT_LUMINANCE_ALPHA_INT32:
+   case MESA_FORMAT_LA_SINT32:
       *datatype = GL_INT;
       *comps = 2;
       return;
@@ -3164,24 +3164,24 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format,
    case MESA_FORMAT_RGB_FLOAT16:
       return format == GL_RGB && type == GL_HALF_FLOAT && !swapBytes;
 
-   case MESA_FORMAT_ALPHA_FLOAT32:
+   case MESA_FORMAT_A_FLOAT32:
       return format == GL_ALPHA && type == GL_FLOAT && !swapBytes;
-   case MESA_FORMAT_ALPHA_FLOAT16:
+   case MESA_FORMAT_A_FLOAT16:
       return format == GL_ALPHA && type == GL_HALF_FLOAT && !swapBytes;
 
-   case MESA_FORMAT_LUMINANCE_FLOAT32:
+   case MESA_FORMAT_L_FLOAT32:
       return format == GL_LUMINANCE && type == GL_FLOAT && !swapBytes;
-   case MESA_FORMAT_LUMINANCE_FLOAT16:
+   case MESA_FORMAT_L_FLOAT16:
       return format == GL_LUMINANCE && type == GL_HALF_FLOAT && !swapBytes;
 
-   case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32:
+   case MESA_FORMAT_LA_FLOAT32:
       return format == GL_LUMINANCE_ALPHA && type == GL_FLOAT && !swapBytes;
-   case MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16:
+   case MESA_FORMAT_LA_FLOAT16:
       return format == GL_LUMINANCE_ALPHA && type == GL_HALF_FLOAT && !swapBytes;
 
-   case MESA_FORMAT_INTENSITY_FLOAT32:
+   case MESA_FORMAT_I_FLOAT32:
       return format == GL_INTENSITY && type == GL_FLOAT && !swapBytes;
-   case MESA_FORMAT_INTENSITY_FLOAT16:
+   case MESA_FORMAT_I_FLOAT16:
       return format == GL_INTENSITY && type == GL_HALF_FLOAT && !swapBytes;
 
    case MESA_FORMAT_R_FLOAT32:
@@ -3194,62 +3194,62 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format,
    case MESA_FORMAT_RG_FLOAT16:
       return format == GL_RG && type == GL_HALF_FLOAT && !swapBytes;
 
-   case MESA_FORMAT_ALPHA_UINT8:
+   case MESA_FORMAT_A_UINT8:
       return format == GL_ALPHA_INTEGER && type == GL_UNSIGNED_BYTE;
-   case MESA_FORMAT_ALPHA_UINT16:
+   case MESA_FORMAT_A_UINT16:
       return format == GL_ALPHA_INTEGER && type == GL_UNSIGNED_SHORT &&
              !swapBytes;
-   case MESA_FORMAT_ALPHA_UINT32:
+   case MESA_FORMAT_A_UINT32:
       return format == GL_ALPHA_INTEGER && type == GL_UNSIGNED_INT &&
              !swapBytes;
-   case MESA_FORMAT_ALPHA_INT8:
+   case MESA_FORMAT_A_SINT8:
       return format == GL_ALPHA_INTEGER && type == GL_BYTE;
-   case MESA_FORMAT_ALPHA_INT16:
+   case MESA_FORMAT_A_SINT16:
       return format == GL_ALPHA_INTEGER && type == GL_SHORT && !swapBytes;
-   case MESA_FORMAT_ALPHA_INT32:
+   case MESA_FORMAT_A_SINT32:
       return format == GL_ALPHA_INTEGER && type == GL_INT && !swapBytes;
 
-   case MESA_FORMAT_INTENSITY_UINT8:
-   case MESA_FORMAT_INTENSITY_UINT16:
-   case MESA_FORMAT_INTENSITY_UINT32:
-   case MESA_FORMAT_INTENSITY_INT8:
-   case MESA_FORMAT_INTENSITY_INT16:
-   case MESA_FORMAT_INTENSITY_INT32:
+   case MESA_FORMAT_I_UINT8:
+   case MESA_FORMAT_I_UINT16:
+   case MESA_FORMAT_I_UINT32:
+   case MESA_FORMAT_I_SINT8:
+   case MESA_FORMAT_I_SINT16:
+   case MESA_FORMAT_I_SINT32:
       /* GL_INTENSITY_INTEGER_EXT doesn't exist. */
       return GL_FALSE;
 
-   case MESA_FORMAT_LUMINANCE_UINT8:
+   case MESA_FORMAT_L_UINT8:
       return format == GL_LUMINANCE_INTEGER_EXT && type == GL_UNSIGNED_BYTE;
-   case MESA_FORMAT_LUMINANCE_UINT16:
+   case MESA_FORMAT_L_UINT16:
       return format == GL_LUMINANCE_INTEGER_EXT && type == GL_UNSIGNED_SHORT &&
              !swapBytes;
-   case MESA_FORMAT_LUMINANCE_UINT32:
+   case MESA_FORMAT_L_UINT32:
       return format == GL_LUMINANCE_INTEGER_EXT && type == GL_UNSIGNED_INT &&
              !swapBytes;
-   case MESA_FORMAT_LUMINANCE_INT8:
+   case MESA_FORMAT_L_SINT8:
       return format == GL_LUMINANCE_INTEGER_EXT && type == GL_BYTE;
-   case MESA_FORMAT_LUMINANCE_INT16:
+   case MESA_FORMAT_L_SINT16:
       return format == GL_LUMINANCE_INTEGER_EXT && type == GL_SHORT &&
              !swapBytes;
-   case MESA_FORMAT_LUMINANCE_INT32:
+   case MESA_FORMAT_L_SINT32:
       return format == GL_LUMINANCE_INTEGER_EXT && type == GL_INT && !swapBytes;
 
-   case MESA_FORMAT_LUMINANCE_ALPHA_UINT8:
+   case MESA_FORMAT_LA_UINT8:
       return format == GL_LUMINANCE_ALPHA_INTEGER_EXT &&
              type == GL_UNSIGNED_BYTE && !swapBytes;
-   case MESA_FORMAT_LUMINANCE_ALPHA_UINT16:
+   case MESA_FORMAT_LA_UINT16:
       return format == GL_LUMINANCE_ALPHA_INTEGER_EXT &&
              type == GL_UNSIGNED_SHORT && !swapBytes;
-   case MESA_FORMAT_LUMINANCE_ALPHA_UINT32:
+   case MESA_FORMAT_LA_UINT32:
       return format == GL_LUMINANCE_ALPHA_INTEGER_EXT &&
              type == GL_UNSIGNED_INT && !swapBytes;
-   case MESA_FORMAT_LUMINANCE_ALPHA_INT8:
+   case MESA_FORMAT_LA_SINT8:
       return format == GL_LUMINANCE_ALPHA_INTEGER_EXT && type == GL_BYTE &&
              !swapBytes;
-   case MESA_FORMAT_LUMINANCE_ALPHA_INT16:
+   case MESA_FORMAT_LA_SINT16:
       return format == GL_LUMINANCE_ALPHA_INTEGER_EXT && type == GL_SHORT &&
              !swapBytes;
-   case MESA_FORMAT_LUMINANCE_ALPHA_INT32:
+   case MESA_FORMAT_LA_SINT32:
       return format == GL_LUMINANCE_ALPHA_INTEGER_EXT && type == GL_INT &&
              !swapBytes;
 
diff --git a/src/mesa/main/formats.h b/src/mesa/main/formats.h
index f81e29cfa87..c7e99a2f332 100644
--- a/src/mesa/main/formats.h
+++ b/src/mesa/main/formats.h
@@ -450,14 +450,14 @@ typedef enum
    MESA_FORMAT_RGBA_FLOAT16,
    MESA_FORMAT_RGB_FLOAT32,
    MESA_FORMAT_RGB_FLOAT16,
-   MESA_FORMAT_ALPHA_FLOAT32,
-   MESA_FORMAT_ALPHA_FLOAT16,
-   MESA_FORMAT_LUMINANCE_FLOAT32,
-   MESA_FORMAT_LUMINANCE_FLOAT16,
-   MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32,
-   MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16,
-   MESA_FORMAT_INTENSITY_FLOAT32,
-   MESA_FORMAT_INTENSITY_FLOAT16,
+   MESA_FORMAT_A_FLOAT32,
+   MESA_FORMAT_A_FLOAT16,
+   MESA_FORMAT_L_FLOAT32,
+   MESA_FORMAT_L_FLOAT16,
+   MESA_FORMAT_LA_FLOAT32,
+   MESA_FORMAT_LA_FLOAT16,
+   MESA_FORMAT_I_FLOAT32,
+   MESA_FORMAT_I_FLOAT16,
    MESA_FORMAT_R_FLOAT32,
    MESA_FORMAT_R_FLOAT16,
    MESA_FORMAT_RG_FLOAT32,
@@ -471,32 +471,32 @@ typedef enum
     */
 
    /* Type A formats */
-   MESA_FORMAT_ALPHA_UINT8,
-   MESA_FORMAT_ALPHA_UINT16,
-   MESA_FORMAT_ALPHA_UINT32,
-   MESA_FORMAT_ALPHA_INT8,
-   MESA_FORMAT_ALPHA_INT16,
-   MESA_FORMAT_ALPHA_INT32,
-
-   MESA_FORMAT_INTENSITY_UINT8,
-   MESA_FORMAT_INTENSITY_UINT16,
-   MESA_FORMAT_INTENSITY_UINT32,
-   MESA_FORMAT_INTENSITY_INT8,
-   MESA_FORMAT_INTENSITY_INT16,
-   MESA_FORMAT_INTENSITY_INT32,
-
-   MESA_FORMAT_LUMINANCE_UINT8,
-   MESA_FORMAT_LUMINANCE_UINT16,
-   MESA_FORMAT_LUMINANCE_UINT32,
-   MESA_FORMAT_LUMINANCE_INT8,
-   MESA_FORMAT_LUMINANCE_INT16,
-   MESA_FORMAT_LUMINANCE_INT32,
-   MESA_FORMAT_LUMINANCE_ALPHA_UINT8,
-   MESA_FORMAT_LUMINANCE_ALPHA_UINT16,
-   MESA_FORMAT_LUMINANCE_ALPHA_UINT32,
-   MESA_FORMAT_LUMINANCE_ALPHA_INT8,
-   MESA_FORMAT_LUMINANCE_ALPHA_INT16,
-   MESA_FORMAT_LUMINANCE_ALPHA_INT32,
+   MESA_FORMAT_A_UINT8,
+   MESA_FORMAT_A_UINT16,
+   MESA_FORMAT_A_UINT32,
+   MESA_FORMAT_A_SINT8,
+   MESA_FORMAT_A_SINT16,
+   MESA_FORMAT_A_SINT32,
+
+   MESA_FORMAT_I_UINT8,
+   MESA_FORMAT_I_UINT16,
+   MESA_FORMAT_I_UINT32,
+   MESA_FORMAT_I_SINT8,
+   MESA_FORMAT_I_SINT16,
+   MESA_FORMAT_I_SINT32,
+
+   MESA_FORMAT_L_UINT8,
+   MESA_FORMAT_L_UINT16,
+   MESA_FORMAT_L_UINT32,
+   MESA_FORMAT_L_SINT8,
+   MESA_FORMAT_L_SINT16,
+   MESA_FORMAT_L_SINT32,
+   MESA_FORMAT_LA_UINT8,
+   MESA_FORMAT_LA_UINT16,
+   MESA_FORMAT_LA_UINT32,
+   MESA_FORMAT_LA_SINT8,
+   MESA_FORMAT_LA_SINT16,
+   MESA_FORMAT_LA_SINT32,
 
    MESA_FORMAT_R_INT8,
    MESA_FORMAT_RG_INT8,
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;
 
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 0bcbb3297cb..84e64f04dcf 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -4018,81 +4018,81 @@ get_texbuffer_format(const struct gl_context *ctx, GLenum internalFormat)
       case GL_ALPHA16:
          return MESA_FORMAT_A_UNORM16;
       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_ALPHA8I_EXT:
-         return MESA_FORMAT_ALPHA_INT8;
+         return MESA_FORMAT_A_SINT8;
       case GL_ALPHA16I_EXT:
-         return MESA_FORMAT_ALPHA_INT16;
+         return MESA_FORMAT_A_SINT16;
       case GL_ALPHA32I_EXT:
-         return MESA_FORMAT_ALPHA_INT32;
+         return MESA_FORMAT_A_SINT32;
       case GL_ALPHA8UI_EXT:
-         return MESA_FORMAT_ALPHA_UINT8;
+         return MESA_FORMAT_A_UINT8;
       case GL_ALPHA16UI_EXT:
-         return MESA_FORMAT_ALPHA_UINT16;
+         return MESA_FORMAT_A_UINT16;
       case GL_ALPHA32UI_EXT:
-         return MESA_FORMAT_ALPHA_UINT32;
+         return MESA_FORMAT_A_UINT32;
       case GL_LUMINANCE8:
          return MESA_FORMAT_L_UNORM8;
       case GL_LUMINANCE16:
          return MESA_FORMAT_L_UNORM16;
       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_LUMINANCE8I_EXT:
-         return MESA_FORMAT_LUMINANCE_INT8;
+         return MESA_FORMAT_L_SINT8;
       case GL_LUMINANCE16I_EXT:
-         return MESA_FORMAT_LUMINANCE_INT16;
+         return MESA_FORMAT_L_SINT16;
       case GL_LUMINANCE32I_EXT:
-         return MESA_FORMAT_LUMINANCE_INT32;
+         return MESA_FORMAT_L_SINT32;
       case GL_LUMINANCE8UI_EXT:
-         return MESA_FORMAT_LUMINANCE_UINT8;
+         return MESA_FORMAT_L_UINT8;
       case GL_LUMINANCE16UI_EXT:
-         return MESA_FORMAT_LUMINANCE_UINT16;
+         return MESA_FORMAT_L_UINT16;
       case GL_LUMINANCE32UI_EXT:
-         return MESA_FORMAT_LUMINANCE_UINT32;
+         return MESA_FORMAT_L_UINT32;
       case GL_LUMINANCE8_ALPHA8:
          return MESA_FORMAT_L8A8_UNORM;
       case GL_LUMINANCE16_ALPHA16:
          return MESA_FORMAT_L16A16_UNORM;
       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_LUMINANCE_ALPHA8I_EXT:
-         return MESA_FORMAT_LUMINANCE_ALPHA_INT8;
+         return MESA_FORMAT_LA_SINT8;
       case GL_LUMINANCE_ALPHA16I_EXT:
-         return MESA_FORMAT_LUMINANCE_ALPHA_INT8;
+         return MESA_FORMAT_LA_SINT8;
       case GL_LUMINANCE_ALPHA32I_EXT:
-         return MESA_FORMAT_LUMINANCE_ALPHA_INT16;
+         return MESA_FORMAT_LA_SINT16;
       case GL_LUMINANCE_ALPHA8UI_EXT:
-         return MESA_FORMAT_LUMINANCE_ALPHA_UINT8;
+         return MESA_FORMAT_LA_UINT8;
       case GL_LUMINANCE_ALPHA16UI_EXT:
-         return MESA_FORMAT_LUMINANCE_ALPHA_UINT16;
+         return MESA_FORMAT_LA_UINT16;
       case GL_LUMINANCE_ALPHA32UI_EXT:
-         return MESA_FORMAT_LUMINANCE_ALPHA_UINT32;
+         return MESA_FORMAT_LA_UINT32;
       case GL_INTENSITY8:
          return MESA_FORMAT_I_UNORM8;
       case GL_INTENSITY16:
          return MESA_FORMAT_I_UNORM16;
       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_INTENSITY8I_EXT:
-         return MESA_FORMAT_INTENSITY_INT8;
+         return MESA_FORMAT_I_SINT8;
       case GL_INTENSITY16I_EXT:
-         return MESA_FORMAT_INTENSITY_INT16;
+         return MESA_FORMAT_I_SINT16;
       case GL_INTENSITY32I_EXT:
-         return MESA_FORMAT_INTENSITY_INT32;
+         return MESA_FORMAT_I_SINT32;
       case GL_INTENSITY8UI_EXT:
-         return MESA_FORMAT_INTENSITY_UINT8;
+         return MESA_FORMAT_I_UINT8;
       case GL_INTENSITY16UI_EXT:
-         return MESA_FORMAT_INTENSITY_UINT16;
+         return MESA_FORMAT_I_UINT16;
       case GL_INTENSITY32UI_EXT:
-         return MESA_FORMAT_INTENSITY_UINT32;
+         return MESA_FORMAT_I_UINT32;
       default:
          break;
       }
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index bcfaf8dc1ea..7c478e79e63 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -2701,10 +2701,10 @@ _mesa_texstore_rgba_float32(TEXSTORE_PARAMS)
 
    ASSERT(dstFormat == MESA_FORMAT_RGBA_FLOAT32 ||
           dstFormat == MESA_FORMAT_RGB_FLOAT32 ||
-          dstFormat == MESA_FORMAT_ALPHA_FLOAT32 ||
-          dstFormat == MESA_FORMAT_LUMINANCE_FLOAT32 ||
-          dstFormat == MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32 ||
-          dstFormat == MESA_FORMAT_INTENSITY_FLOAT32 ||
+          dstFormat == MESA_FORMAT_A_FLOAT32 ||
+          dstFormat == MESA_FORMAT_L_FLOAT32 ||
+          dstFormat == MESA_FORMAT_LA_FLOAT32 ||
+          dstFormat == MESA_FORMAT_I_FLOAT32 ||
           dstFormat == MESA_FORMAT_R_FLOAT32 ||
           dstFormat == MESA_FORMAT_RG_FLOAT32 ||
           dstFormat == MESA_FORMAT_RGBX_FLOAT32);
@@ -2766,10 +2766,10 @@ _mesa_texstore_rgba_float16(TEXSTORE_PARAMS)
 
    ASSERT(dstFormat == MESA_FORMAT_RGBA_FLOAT16 ||
           dstFormat == MESA_FORMAT_RGB_FLOAT16 ||
-          dstFormat == MESA_FORMAT_ALPHA_FLOAT16 ||
-          dstFormat == MESA_FORMAT_LUMINANCE_FLOAT16 ||
-          dstFormat == MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16 ||
-          dstFormat == MESA_FORMAT_INTENSITY_FLOAT16 ||
+          dstFormat == MESA_FORMAT_A_FLOAT16 ||
+          dstFormat == MESA_FORMAT_L_FLOAT16 ||
+          dstFormat == MESA_FORMAT_LA_FLOAT16 ||
+          dstFormat == MESA_FORMAT_I_FLOAT16 ||
           dstFormat == MESA_FORMAT_R_FLOAT16 ||
           dstFormat == MESA_FORMAT_RG_FLOAT16 ||
           dstFormat == MESA_FORMAT_RGBX_FLOAT16);
@@ -2832,10 +2832,10 @@ _mesa_texstore_rgba_int8(TEXSTORE_PARAMS)
           dstFormat == MESA_FORMAT_RG_INT8 ||
           dstFormat == MESA_FORMAT_RGB_INT8 ||
           dstFormat == MESA_FORMAT_RGBA_INT8 ||
-          dstFormat == MESA_FORMAT_ALPHA_INT8 ||
-          dstFormat == MESA_FORMAT_INTENSITY_INT8 ||
-          dstFormat == MESA_FORMAT_LUMINANCE_INT8 ||
-          dstFormat == MESA_FORMAT_LUMINANCE_ALPHA_INT8 ||
+          dstFormat == MESA_FORMAT_A_SINT8 ||
+          dstFormat == MESA_FORMAT_I_SINT8 ||
+          dstFormat == MESA_FORMAT_L_SINT8 ||
+          dstFormat == MESA_FORMAT_LA_SINT8 ||
           dstFormat == MESA_FORMAT_RGBX_SINT8);
    ASSERT(baseInternalFormat == GL_RGBA ||
           baseInternalFormat == GL_RGB ||
@@ -2903,10 +2903,10 @@ _mesa_texstore_rgba_int16(TEXSTORE_PARAMS)
           dstFormat == MESA_FORMAT_RG_INT16 ||
           dstFormat == MESA_FORMAT_RGB_INT16 ||
           dstFormat == MESA_FORMAT_RGBA_INT16 ||
-          dstFormat == MESA_FORMAT_ALPHA_INT16 ||
-          dstFormat == MESA_FORMAT_LUMINANCE_INT16 ||
-          dstFormat == MESA_FORMAT_INTENSITY_INT16 ||
-          dstFormat == MESA_FORMAT_LUMINANCE_ALPHA_INT16 ||
+          dstFormat == MESA_FORMAT_A_SINT16 ||
+          dstFormat == MESA_FORMAT_L_SINT16 ||
+          dstFormat == MESA_FORMAT_I_SINT16 ||
+          dstFormat == MESA_FORMAT_LA_SINT16 ||
           dstFormat == MESA_FORMAT_RGBX_SINT16);
    ASSERT(baseInternalFormat == GL_RGBA ||
           baseInternalFormat == GL_RGB ||
@@ -2974,10 +2974,10 @@ _mesa_texstore_rgba_int32(TEXSTORE_PARAMS)
           dstFormat == MESA_FORMAT_RG_INT32 ||
           dstFormat == MESA_FORMAT_RGB_INT32 ||
           dstFormat == MESA_FORMAT_RGBA_INT32 ||
-          dstFormat == MESA_FORMAT_ALPHA_INT32 ||
-          dstFormat == MESA_FORMAT_INTENSITY_INT32 ||
-          dstFormat == MESA_FORMAT_LUMINANCE_INT32 ||
-          dstFormat == MESA_FORMAT_LUMINANCE_ALPHA_INT32 ||
+          dstFormat == MESA_FORMAT_A_SINT32 ||
+          dstFormat == MESA_FORMAT_I_SINT32 ||
+          dstFormat == MESA_FORMAT_L_SINT32 ||
+          dstFormat == MESA_FORMAT_LA_SINT32 ||
           dstFormat == MESA_FORMAT_RGBX_SINT32);
    ASSERT(baseInternalFormat == GL_RGBA ||
           baseInternalFormat == GL_RGB ||
@@ -3045,10 +3045,10 @@ _mesa_texstore_rgba_uint8(TEXSTORE_PARAMS)
           dstFormat == MESA_FORMAT_RG_UINT8 ||
           dstFormat == MESA_FORMAT_RGB_UINT8 ||
           dstFormat == MESA_FORMAT_RGBA_UINT8 ||
-          dstFormat == MESA_FORMAT_ALPHA_UINT8 ||
-          dstFormat == MESA_FORMAT_INTENSITY_UINT8 ||
-          dstFormat == MESA_FORMAT_LUMINANCE_UINT8 ||
-          dstFormat == MESA_FORMAT_LUMINANCE_ALPHA_UINT8 ||
+          dstFormat == MESA_FORMAT_A_UINT8 ||
+          dstFormat == MESA_FORMAT_I_UINT8 ||
+          dstFormat == MESA_FORMAT_L_UINT8 ||
+          dstFormat == MESA_FORMAT_LA_UINT8 ||
           dstFormat == MESA_FORMAT_RGBX_UINT8);
    ASSERT(baseInternalFormat == GL_RGBA ||
           baseInternalFormat == GL_RGB ||
@@ -3113,10 +3113,10 @@ _mesa_texstore_rgba_uint16(TEXSTORE_PARAMS)
           dstFormat == MESA_FORMAT_RG_UINT16 ||
           dstFormat == MESA_FORMAT_RGB_UINT16 ||
           dstFormat == MESA_FORMAT_RGBA_UINT16 ||
-          dstFormat == MESA_FORMAT_ALPHA_UINT16 ||
-          dstFormat == MESA_FORMAT_INTENSITY_UINT16 ||
-          dstFormat == MESA_FORMAT_LUMINANCE_UINT16 ||
-          dstFormat == MESA_FORMAT_LUMINANCE_ALPHA_UINT16 ||
+          dstFormat == MESA_FORMAT_A_UINT16 ||
+          dstFormat == MESA_FORMAT_I_UINT16 ||
+          dstFormat == MESA_FORMAT_L_UINT16 ||
+          dstFormat == MESA_FORMAT_LA_UINT16 ||
           dstFormat == MESA_FORMAT_RGBX_UINT16);
    ASSERT(baseInternalFormat == GL_RGBA ||
           baseInternalFormat == GL_RGB ||
@@ -3181,10 +3181,10 @@ _mesa_texstore_rgba_uint32(TEXSTORE_PARAMS)
           dstFormat == MESA_FORMAT_RG_UINT32 ||
           dstFormat == MESA_FORMAT_RGB_UINT32 ||
           dstFormat == MESA_FORMAT_RGBA_UINT32 ||
-          dstFormat == MESA_FORMAT_ALPHA_UINT32 ||
-          dstFormat == MESA_FORMAT_INTENSITY_UINT32 ||
-          dstFormat == MESA_FORMAT_LUMINANCE_UINT32 ||
-          dstFormat == MESA_FORMAT_LUMINANCE_ALPHA_UINT32 ||
+          dstFormat == MESA_FORMAT_A_UINT32 ||
+          dstFormat == MESA_FORMAT_I_UINT32 ||
+          dstFormat == MESA_FORMAT_L_UINT32 ||
+          dstFormat == MESA_FORMAT_LA_UINT32 ||
           dstFormat == MESA_FORMAT_RGBX_UINT32);
    ASSERT(baseInternalFormat == GL_RGBA ||
           baseInternalFormat == GL_RGB ||
@@ -3724,14 +3724,14 @@ _mesa_get_texstore_func(mesa_format format)
       table[MESA_FORMAT_RGBA_FLOAT16] = _mesa_texstore_rgba_float16;
       table[MESA_FORMAT_RGB_FLOAT32] = _mesa_texstore_rgba_float32;
       table[MESA_FORMAT_RGB_FLOAT16] = _mesa_texstore_rgba_float16;
-      table[MESA_FORMAT_ALPHA_FLOAT32] = _mesa_texstore_rgba_float32;
-      table[MESA_FORMAT_ALPHA_FLOAT16] = _mesa_texstore_rgba_float16;
-      table[MESA_FORMAT_LUMINANCE_FLOAT32] = _mesa_texstore_rgba_float32;
-      table[MESA_FORMAT_LUMINANCE_FLOAT16] = _mesa_texstore_rgba_float16;
-      table[MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32] = _mesa_texstore_rgba_float32;
-      table[MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16] = _mesa_texstore_rgba_float16;
-      table[MESA_FORMAT_INTENSITY_FLOAT32] = _mesa_texstore_rgba_float32;
-      table[MESA_FORMAT_INTENSITY_FLOAT16] = _mesa_texstore_rgba_float16;
+      table[MESA_FORMAT_A_FLOAT32] = _mesa_texstore_rgba_float32;
+      table[MESA_FORMAT_A_FLOAT16] = _mesa_texstore_rgba_float16;
+      table[MESA_FORMAT_L_FLOAT32] = _mesa_texstore_rgba_float32;
+      table[MESA_FORMAT_L_FLOAT16] = _mesa_texstore_rgba_float16;
+      table[MESA_FORMAT_LA_FLOAT32] = _mesa_texstore_rgba_float32;
+      table[MESA_FORMAT_LA_FLOAT16] = _mesa_texstore_rgba_float16;
+      table[MESA_FORMAT_I_FLOAT32] = _mesa_texstore_rgba_float32;
+      table[MESA_FORMAT_I_FLOAT16] = _mesa_texstore_rgba_float16;
       table[MESA_FORMAT_R_FLOAT32] = _mesa_texstore_rgba_float32;
       table[MESA_FORMAT_R_FLOAT16] = _mesa_texstore_rgba_float16;
       table[MESA_FORMAT_RG_FLOAT32] = _mesa_texstore_rgba_float32;
@@ -3781,33 +3781,33 @@ _mesa_get_texstore_func(mesa_format format)
       table[MESA_FORMAT_Z_FLOAT32] = _mesa_texstore_z32;
       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;
-      table[MESA_FORMAT_ALPHA_UINT32] = _mesa_texstore_rgba_uint32;
-      table[MESA_FORMAT_ALPHA_INT8] = _mesa_texstore_rgba_int8;
-      table[MESA_FORMAT_ALPHA_INT16] = _mesa_texstore_rgba_int16;
-      table[MESA_FORMAT_ALPHA_INT32] = _mesa_texstore_rgba_int32;
-
-      table[MESA_FORMAT_INTENSITY_UINT8] = _mesa_texstore_rgba_uint8;
-      table[MESA_FORMAT_INTENSITY_UINT16] = _mesa_texstore_rgba_uint16;
-      table[MESA_FORMAT_INTENSITY_UINT32] = _mesa_texstore_rgba_uint32;
-      table[MESA_FORMAT_INTENSITY_INT8] = _mesa_texstore_rgba_int8;
-      table[MESA_FORMAT_INTENSITY_INT16] = _mesa_texstore_rgba_int16;
-      table[MESA_FORMAT_INTENSITY_INT32] = _mesa_texstore_rgba_int32;
-
-      table[MESA_FORMAT_LUMINANCE_UINT8] = _mesa_texstore_rgba_uint8;
-      table[MESA_FORMAT_LUMINANCE_UINT16] = _mesa_texstore_rgba_uint16;
-      table[MESA_FORMAT_LUMINANCE_UINT32] = _mesa_texstore_rgba_uint32;
-      table[MESA_FORMAT_LUMINANCE_INT8] = _mesa_texstore_rgba_int8;
-      table[MESA_FORMAT_LUMINANCE_INT16] = _mesa_texstore_rgba_int16;
-      table[MESA_FORMAT_LUMINANCE_INT32] = _mesa_texstore_rgba_int32;
-
-      table[MESA_FORMAT_LUMINANCE_ALPHA_UINT8] = _mesa_texstore_rgba_uint8;
-      table[MESA_FORMAT_LUMINANCE_ALPHA_UINT16] = _mesa_texstore_rgba_uint16;
-      table[MESA_FORMAT_LUMINANCE_ALPHA_UINT32] = _mesa_texstore_rgba_uint32;
-      table[MESA_FORMAT_LUMINANCE_ALPHA_INT8] = _mesa_texstore_rgba_int8;
-      table[MESA_FORMAT_LUMINANCE_ALPHA_INT16] = _mesa_texstore_rgba_int16;
-      table[MESA_FORMAT_LUMINANCE_ALPHA_INT32] = _mesa_texstore_rgba_int32;
+      table[MESA_FORMAT_A_UINT8] = _mesa_texstore_rgba_uint8;
+      table[MESA_FORMAT_A_UINT16] = _mesa_texstore_rgba_uint16;
+      table[MESA_FORMAT_A_UINT32] = _mesa_texstore_rgba_uint32;
+      table[MESA_FORMAT_A_SINT8] = _mesa_texstore_rgba_int8;
+      table[MESA_FORMAT_A_SINT16] = _mesa_texstore_rgba_int16;
+      table[MESA_FORMAT_A_SINT32] = _mesa_texstore_rgba_int32;
+
+      table[MESA_FORMAT_I_UINT8] = _mesa_texstore_rgba_uint8;
+      table[MESA_FORMAT_I_UINT16] = _mesa_texstore_rgba_uint16;
+      table[MESA_FORMAT_I_UINT32] = _mesa_texstore_rgba_uint32;
+      table[MESA_FORMAT_I_SINT8] = _mesa_texstore_rgba_int8;
+      table[MESA_FORMAT_I_SINT16] = _mesa_texstore_rgba_int16;
+      table[MESA_FORMAT_I_SINT32] = _mesa_texstore_rgba_int32;
+
+      table[MESA_FORMAT_L_UINT8] = _mesa_texstore_rgba_uint8;
+      table[MESA_FORMAT_L_UINT16] = _mesa_texstore_rgba_uint16;
+      table[MESA_FORMAT_L_UINT32] = _mesa_texstore_rgba_uint32;
+      table[MESA_FORMAT_L_SINT8] = _mesa_texstore_rgba_int8;
+      table[MESA_FORMAT_L_SINT16] = _mesa_texstore_rgba_int16;
+      table[MESA_FORMAT_L_SINT32] = _mesa_texstore_rgba_int32;
+
+      table[MESA_FORMAT_LA_UINT8] = _mesa_texstore_rgba_uint8;
+      table[MESA_FORMAT_LA_UINT16] = _mesa_texstore_rgba_uint16;
+      table[MESA_FORMAT_LA_UINT32] = _mesa_texstore_rgba_uint32;
+      table[MESA_FORMAT_LA_SINT8] = _mesa_texstore_rgba_int8;
+      table[MESA_FORMAT_LA_SINT16] = _mesa_texstore_rgba_int16;
+      table[MESA_FORMAT_LA_SINT32] = _mesa_texstore_rgba_int32;
 
       table[MESA_FORMAT_R_INT8] = _mesa_texstore_rgba_int8;
       table[MESA_FORMAT_RG_INT8] = _mesa_texstore_rgba_int8;