mesa: added glEnable/Disable state for transform feedback

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

diff --git a/src/mesa/main/colormac.h b/src/mesa/main/colormac.h
index 815624ee5080c5f1101a702f724e2d2015db8a3a..905f4e2283733a5c7d416d2c0df9dcf27950ea3b 100644 (file)
--- a/src/mesa/main/colormac.h
+++ b/src/mesa/main/colormac.h
@@ -140,9 +140,9 @@
  */
 #define UNCLAMPED_FLOAT_TO_RGB_CHAN(dst, f)    \
 do {                                           \
-   UNCLAMPED_FLOAT_TO_CHAN(dst[0], f[0]);      \
-   UNCLAMPED_FLOAT_TO_CHAN(dst[1], f[1]);      \
-   UNCLAMPED_FLOAT_TO_CHAN(dst[2], f[2]);      \
+   UNCLAMPED_FLOAT_TO_CHAN((dst)[0], (f)[0]);  \
+   UNCLAMPED_FLOAT_TO_CHAN((dst)[1], (f)[1]);  \
+   UNCLAMPED_FLOAT_TO_CHAN((dst)[2], (f)[2]);  \
 } while (0)
 
 
@@ -156,10 +156,10 @@ do {                                              \
  */
 #define UNCLAMPED_FLOAT_TO_RGBA_CHAN(dst, f)   \
 do {                                           \
-   UNCLAMPED_FLOAT_TO_CHAN(dst[0], f[0]);      \
-   UNCLAMPED_FLOAT_TO_CHAN(dst[1], f[1]);      \
-   UNCLAMPED_FLOAT_TO_CHAN(dst[2], f[2]);      \
-   UNCLAMPED_FLOAT_TO_CHAN(dst[3], f[3]);      \
+   UNCLAMPED_FLOAT_TO_CHAN((dst)[0], (f)[0]);  \
+   UNCLAMPED_FLOAT_TO_CHAN((dst)[1], (f)[1]);  \
+   UNCLAMPED_FLOAT_TO_CHAN((dst)[2], (f)[2]);  \
+   UNCLAMPED_FLOAT_TO_CHAN((dst)[3], (f)[3]);  \
 } while (0)
 
 
@@ -210,6 +210,12 @@ do {                                               \
 #define PACK_COLOR_88_REV( L, A )                                      \
    (((A) << 8) | (L))
 
+#define PACK_COLOR_1616( L, A )                                                \
+   (((L) << 16) | (A))
+
+#define PACK_COLOR_1616_REV( L, A )                                    \
+   (((A) << 16) | (L))
+
 #define PACK_COLOR_332( R, G, B )                                      \
    (((R) & 0xe0) | (((G) & 0xe0) >> 3) | (((B) & 0xc0) >> 6))