mesa: Rename _mesa_..._array_obj functions to _mesa_..._vao.

[mesa.git] / src / mesa / main / formats.h

diff --git a/src/mesa/main/formats.h b/src/mesa/main/formats.h
index d2eedc1cf41e634e1688606ac39135307fc68ec4..66c01c1c9a2d75aa81e6a2bccd97c1e74cc226f9 100644 (file)
--- a/src/mesa/main/formats.h
+++ b/src/mesa/main/formats.h
@@ -498,19 +498,19 @@ typedef enum
    MESA_FORMAT_LA_SINT16,
    MESA_FORMAT_LA_SINT32,
 
-   MESA_FORMAT_R_INT8,
-   MESA_FORMAT_RG_INT8,
-   MESA_FORMAT_RGB_INT8,
-   MESA_FORMAT_RGBA_INT8,
-   MESA_FORMAT_R_INT16,
-   MESA_FORMAT_RG_INT16,
-   MESA_FORMAT_RGB_INT16,
-   MESA_FORMAT_RGBA_INT16,
-
-   MESA_FORMAT_R_INT32,
-   MESA_FORMAT_RG_INT32,
-   MESA_FORMAT_RGB_INT32,
-   MESA_FORMAT_RGBA_INT32,
+   MESA_FORMAT_R_SINT8,
+   MESA_FORMAT_RG_SINT8,
+   MESA_FORMAT_RGB_SINT8,
+   MESA_FORMAT_RGBA_SINT8,
+   MESA_FORMAT_R_SINT16,
+   MESA_FORMAT_RG_SINT16,
+   MESA_FORMAT_RGB_SINT16,
+   MESA_FORMAT_RGBA_SINT16,
+
+   MESA_FORMAT_R_SINT32,
+   MESA_FORMAT_RG_SINT32,
+   MESA_FORMAT_RGB_SINT32,
+   MESA_FORMAT_RGBA_SINT32,
 
    /**
     * \name Non-normalized unsigned integer formats.
@@ -562,17 +562,17 @@ typedef enum
 
    /*@{*/
    /* Type C formats */
-   MESA_FORMAT_RED_RGTC1,
-   MESA_FORMAT_SIGNED_RED_RGTC1,
-   MESA_FORMAT_RG_RGTC2,
-   MESA_FORMAT_SIGNED_RG_RGTC2,
+   MESA_FORMAT_R_RGTC1_UNORM,
+   MESA_FORMAT_R_RGTC1_SNORM,
+   MESA_FORMAT_RG_RGTC2_UNORM,
+   MESA_FORMAT_RG_RGTC2_SNORM,
    /*@}*/
 
    /*@{*/
-   MESA_FORMAT_L_LATC1,
-   MESA_FORMAT_SIGNED_L_LATC1,
-   MESA_FORMAT_LA_LATC2,
-   MESA_FORMAT_SIGNED_LA_LATC2,
+   MESA_FORMAT_L_LATC1_UNORM,
+   MESA_FORMAT_L_LATC1_SNORM,
+   MESA_FORMAT_LA_LATC2_UNORM,
+   MESA_FORMAT_LA_LATC2_SNORM,
    /*@}*/
 
    MESA_FORMAT_ETC1_RGB8,