diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-08 21:42:21 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-08 21:42:21 +0000 |
| commit | ee97a3165b1f07f011cf95804590925b81e8ec96 (patch) | |
| tree | 58aa78664ad871145a5a0149f9ad60f140f934aa /mesalib/src/mesa/main/colormac.h | |
| parent | c8a34ce9318446bcd8e91e601525a61d6847f28f (diff) | |
| parent | 432768f75da13ee5343957df6ce5cd316a62929f (diff) | |
| download | vcxsrv-ee97a3165b1f07f011cf95804590925b81e8ec96.tar.gz vcxsrv-ee97a3165b1f07f011cf95804590925b81e8ec96.tar.bz2 vcxsrv-ee97a3165b1f07f011cf95804590925b81e8ec96.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/colormac.h')
| -rw-r--r-- | mesalib/src/mesa/main/colormac.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/colormac.h b/mesalib/src/mesa/main/colormac.h index 995183aeb..ebad20fc4 100644 --- a/mesalib/src/mesa/main/colormac.h +++ b/mesalib/src/mesa/main/colormac.h @@ -198,10 +198,14 @@ do { \ ((((B) & 0xf8) >> 1) | (((G) & 0xc0) >> 6) | (((G) & 0x38) << 10) | (((R) & 0xf8) << 5) | \
((A) ? 0x80 : 0))
-#define PACK_COLOR_2101010( A, B, G, R ) \
+#define PACK_COLOR_2101010_UB( A, B, G, R ) \
(((B) << 22) | ((G) << 12) | ((R) << 2) | \
(((A) & 0xc0) << 24))
+#define PACK_COLOR_2101010_US( A, B, G, R ) \
+ ((((B) >> 6) << 20) | (((G) >> 6) << 10) | ((R) >> 6) | \
+ (((A) >> 14) << 30))
+
#define PACK_COLOR_4444( R, G, B, A ) \
((((R) & 0xf0) << 8) | (((G) & 0xf0) << 4) | ((B) & 0xf0) | ((A) >> 4))
|