Merge branch 'radeon-texrewrite-clean' into mesa_7_7_branch

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

diff --git a/src/mesa/main/colormac.h b/src/mesa/main/colormac.h
index a19521fc85b559270d15ccd52aa0bc92763ace43..905f4e2283733a5c7d416d2c0df9dcf27950ea3b 100644 (file)
--- a/src/mesa/main/colormac.h
+++ b/src/mesa/main/colormac.h
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.1
+ * Version:  7.3
  *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -71,9 +71,6 @@
 /** \def COPY_CHAN4
  * Copy a GLchan[4] array */
 
-/** \def CHAN_PRODUCT
- * Scaled product (usually approximated) between two GLchan arguments */
-
 #if CHAN_BITS == 8
 
 #define BYTE_TO_CHAN(b)   ((b) < 0 ? 0 : (GLchan) (b))
@@ -91,8 +88,6 @@
 
 #define COPY_CHAN4(DST, SRC)  COPY_4UBV(DST, SRC)
 
-#define CHAN_PRODUCT(a, b)  ((GLubyte) (((GLint)(a) * ((GLint)(b) + 1)) >> 8))
-
 #elif CHAN_BITS == 16
 
 #define BYTE_TO_CHAN(b)   ((b) < 0 ? 0 : (((GLchan) (b)) * 516))
@@ -110,8 +105,6 @@
 
 #define COPY_CHAN4(DST, SRC)  COPY_4V(DST, SRC)
 
-#define CHAN_PRODUCT(a, b) ((GLchan) ((((GLuint) (a)) * ((GLuint) (b))) / 65535))
-
 #elif CHAN_BITS == 32
 
 /* XXX floating-point color channels not fully thought-out */
@@ -130,8 +123,6 @@
 
 #define COPY_CHAN4(DST, SRC)  COPY_4V(DST, SRC)
 
-#define CHAN_PRODUCT(a, b)    ((a) * (b))
-
 #else
 
 #error unexpected CHAN_BITS size
@@ -149,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)
 
 
@@ -165,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)
 
 
@@ -180,20 +171,24 @@ do {                                              \
  */
 /*@{*/
 
-#define PACK_COLOR_8888( R, G, B, A )                                  \
-   (((R) << 24) | ((G) << 16) | ((B) << 8) | (A))
+#define PACK_COLOR_8888( X, Y, Z, W ) \
+   (((X) << 24) | ((Y) << 16) | ((Z) << 8) | (W))
 
-#define PACK_COLOR_8888_REV( R, G, B, A )                              \
-   (((A) << 24) | ((B) << 16) | ((G) << 8) | (R))
+#define PACK_COLOR_8888_REV( X, Y, Z, W ) \
+   (((W) << 24) | ((Z) << 16) | ((Y) << 8) | (X))
 
-#define PACK_COLOR_888( R, G, B )                                      \
-   (((R) << 16) | ((G) << 8) | (B))
+#define PACK_COLOR_888( X, Y, Z ) \
+   (((X) << 16) | ((Y) << 8) | (Z))
 
-#define PACK_COLOR_565( R, G, B )                                      \
-   ((((R) & 0xf8) << 8) | (((G) & 0xfc) << 3) | (((B) & 0xf8) >> 3))
+#define PACK_COLOR_565( X, Y, Z )                                  \
+   ((((X) & 0xf8) << 8) | (((Y) & 0xfc) << 3) | (((Z) & 0xf8) >> 3))
 
-#define PACK_COLOR_565_REV( R, G, B )                                  \
-   (((R) & 0xf8) | ((G) & 0xe0) >> 5 | (((G) & 0x1c) << 11) | (((B) & 0xf8) << 5))
+#define PACK_COLOR_565_REV( X, Y, Z ) \
+   (((X) & 0xf8) | ((Y) & 0xe0) >> 5 | (((Y) & 0x1c) << 11) | (((Z) & 0xf8) << 5))
+
+#define PACK_COLOR_5551( R, G, B, A )                                  \
+   ((((R) & 0xf8) << 8) | (((G) & 0xf8) << 3) | (((B) & 0xf8) >> 2) |  \
+    ((A) ? 1 : 0))
 
 #define PACK_COLOR_1555( A, B, G, R )                                  \
    ((((B) & 0xf8) << 7) | (((G) & 0xf8) << 2) | (((R) & 0xf8) >> 3) |  \
@@ -215,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))