1 files changed, 34 insertions, 34 deletions
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,