diff options
Diffstat (limited to 'src/mesa/main/colormac.h')
| -rw-r--r-- | src/mesa/main/colormac.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/main/colormac.h b/src/mesa/main/colormac.h index c5c129eaa4..0812a51704 100644 --- a/src/mesa/main/colormac.h +++ b/src/mesa/main/colormac.h @@ -1,4 +1,4 @@ -/* $Id: colormac.h,v 1.8 2001/03/08 15:23:46 brianp Exp $ */ +/* $Id: colormac.h,v 1.9 2001/03/11 18:49:11 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -51,6 +51,7 @@ #define INT_TO_CHAN(i) ((i) < 0 ? 0 : (GLchan) ((i) >> 23)) #define UINT_TO_CHAN(i) ((GLchan) ((i) >> 24)) +#define CHAN_TO_UBYTE(c) (c) #define CHAN_TO_FLOAT(c) UBYTE_TO_FLOAT(c) #define CLAMPED_FLOAT_TO_CHAN(c, f) CLAMPED_FLOAT_TO_UBYTE(c, f) @@ -70,6 +71,7 @@ #define INT_TO_CHAN(i) ((i) < 0 ? 0 : (GLchan) ((i) >> 15)) #define UINT_TO_CHAN(i) ((GLchan) ((i) >> 16)) +#define CHAN_TO_UBYTE(c) ((c) >> 8) #define CHAN_TO_FLOAT(c) ((GLfloat) ((c) * (1.0 / CHAN_MAXF))) #define CLAMPED_FLOAT_TO_CHAN(c, f) \ @@ -92,6 +94,7 @@ #define INT_TO_CHAN(i) ((GLfloat) ((i) * (1.0F / 2147483647.0F))) #define UINT_TO_CHAN(i) ((GLfloat) ((i) * (1.0F / 4294967295.0F))) +#define CHAN_TO_UBYTE(c) FLOAT_TO_UBYTE(c) #define CHAN_TO_FLOAT(c) (c) #define CLAMPED_FLOAT_TO_CHAN(c, f) c = (f) @@ -101,7 +104,7 @@ #define CHAN_PRODUCT(a, b) ((a) * (b)) -#else +#else #error unexpected CHAN_BITS size |