util: Make pixel format layout more meaningful.

Namelly, explicitly distinguish formats coded by arithmetic manipulation,
from formats layed out in array.

1 files changed, 8 insertions, 5 deletions

diff --git a/src/gallium/auxiliary/util/u_format.h b/src/gallium/auxiliary/util/u_format.h
index 2d7730fbc51..b5504ebe056 100644
--- a/src/gallium/auxiliary/util/u_format.h
+++ b/src/gallium/auxiliary/util/u_format.h
@@ -34,10 +34,11 @@
 
 
 enum util_format_layout {
-   UTIL_FORMAT_LAYOUT_RGBA = 0,
-   UTIL_FORMAT_LAYOUT_ZS = 1,
-   UTIL_FORMAT_LAYOUT_YUV = 2,
-   UTIL_FORMAT_LAYOUT_DXT = 3
+   UTIL_FORMAT_LAYOUT_SCALAR = 0,
+   UTIL_FORMAT_LAYOUT_ARITH = 1,
+   UTIL_FORMAT_LAYOUT_ARRAY = 2,
+   UTIL_FORMAT_LAYOUT_YUV = 3,
+   UTIL_FORMAT_LAYOUT_DXT = 4
 };
 
 
@@ -76,7 +77,9 @@ enum util_format_swizzle {
 
 enum util_format_colorspace {
    UTIL_FORMAT_COLORSPACE_RGB = 0,
-   UTIL_FORMAT_COLORSPACE_SRGB = 1
+   UTIL_FORMAT_COLORSPACE_SRGB = 1,
+   UTIL_FORMAT_COLORSPACE_YUV = 2,
+   UTIL_FORMAT_COLORSPACE_ZS = 3,
 };