From 3041d05bbcccfddba01a1eeaba01e5da0e1e99af Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 2 Jan 2001 22:02:51 +0000 Subject: Removed fixed.h (GLfixed now in mtypes.h, fixed-pt macros in mmath.h) Clean-up of color conversion macros. New mmath.h macros (IROUND, IFLOOR, ICEIL, FRAC) used in various places. --- src/mesa/main/colormac.h | 118 ++++++++++------------------------------------- 1 file changed, 24 insertions(+), 94 deletions(-) (limited to 'src/mesa/main/colormac.h') diff --git a/src/mesa/main/colormac.h b/src/mesa/main/colormac.h index f0a7cc96b2..6101ab0225 100644 --- a/src/mesa/main/colormac.h +++ b/src/mesa/main/colormac.h @@ -1,4 +1,4 @@ -/* $Id: colormac.h,v 1.4 2000/11/24 10:25:05 keithw Exp $ */ +/* $Id: colormac.h,v 1.5 2001/01/02 22:02:51 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -42,60 +42,6 @@ */ -/* - * Integer / float conversion for colors, normals, etc. - */ - -#define BYTE_TO_UBYTE(b) (b < 0 ? 0 : (GLubyte) b) -#define SHORT_TO_UBYTE(s) (s < 0 ? 0 : (GLubyte) (s >> 7)) -#define USHORT_TO_UBYTE(s) (GLubyte) (s >> 8) -#define INT_TO_UBYTE(i) (i < 0 ? 0 : (GLubyte) (i >> 23)) -#define UINT_TO_UBYTE(i) (GLubyte) (i >> 24) - -/* Convert GLfloat in [0.0,1.0] to GLubyte in [0,255] */ -#define FLOAT_TO_UBYTE(X) ((GLubyte) (GLint) (((X)) * 255.0F)) - - -/* Convert GLbyte in [-128,127] to GLfloat in [-1.0,1.0] */ -#define BYTE_TO_FLOAT(B) ((2.0F * (B) + 1.0F) * (1.0F/255.0F)) - -/* Convert GLfloat in [-1.0,1.0] to GLbyte in [-128,127] */ -#define FLOAT_TO_BYTE(X) ( (((GLint) (255.0F * (X))) - 1) / 2 ) - - -/* Convert GLushort in [0,65536] to GLfloat in [0.0,1.0] */ -#define USHORT_TO_FLOAT(S) ((GLfloat) (S) * (1.0F / 65535.0F)) - -/* Convert GLfloat in [0.0,1.0] to GLushort in [0,65536] */ -#define FLOAT_TO_USHORT(X) ((GLushort) (GLint) ((X) * 65535.0F)) - - -/* Convert GLshort in [-32768,32767] to GLfloat in [-1.0,1.0] */ -#define SHORT_TO_FLOAT(S) ((2.0F * (S) + 1.0F) * (1.0F/65535.0F)) - -/* Convert GLfloat in [0.0,1.0] to GLshort in [-32768,32767] */ -#define FLOAT_TO_SHORT(X) ( (((GLint) (65535.0F * (X))) - 1) / 2 ) - - -/* Convert GLuint in [0,4294967295] to GLfloat in [0.0,1.0] */ -#define UINT_TO_FLOAT(U) ((GLfloat) (U) * (1.0F / 4294967295.0F)) - -/* Convert GLfloat in [0.0,1.0] to GLuint in [0,4294967295] */ -#define FLOAT_TO_UINT(X) ((GLuint) ((X) * 4294967295.0)) - - -/* Convert GLint in [-2147483648,2147483647] to GLfloat in [-1.0,1.0] */ -#define INT_TO_FLOAT(I) ((2.0F * (I) + 1.0F) * (1.0F/4294967294.0F)) - -/* Convert GLfloat in [-1.0,1.0] to GLint in [-2147483648,2147483647] */ -/* causes overflow: -#define FLOAT_TO_INT(X) ( (((GLint) (4294967294.0F * (X))) - 1) / 2 ) -*/ -/* a close approximation: */ -#define FLOAT_TO_INT(X) ( (GLint) (2147483647.0 * (X)) ) - - - #if CHAN_BITS == 8 #define BYTE_TO_CHAN(b) ((b) < 0 ? 0 : (GLchan) (b)) @@ -106,12 +52,15 @@ #define UINT_TO_CHAN(i) ((GLchan) ((i) >> 24)) #define CHAN_TO_FLOAT(c) UBYTE_TO_FLOAT(c) +#define FLOAT_TO_CHAN(f) ( (GLchan) IROUND((f) * CHAN_MAXF) ) -#define FLOAT_COLOR_TO_CHAN(c, f) FLOAT_COLOR_TO_UBYTE_COLOR(c, f) +#define CLAMPED_FLOAT_TO_CHAN(c, f) CLAMPED_FLOAT_TO_UBYTE(c, f) +#define UNCLAMPED_FLOAT_TO_CHAN(c, f) UNCLAMPED_FLOAT_TO_UBYTE(c, f) #define COPY_CHAN4(DST, SRC) COPY_4UBV(DST, SRC) -#define CHAN_PRODUCT(a, b) ( (GLubyte) (((GLint)(a) * ((GLint)(b) + 1)) >> 8) ) +#define CHAN_PRODUCT(a, b) ((GLubyte) (((GLint)(a) * ((GLint)(b) + 1)) >> 8)) + #elif CHAN_BITS == 16 @@ -122,14 +71,18 @@ #define INT_TO_CHAN(i) ((i) < 0 ? 0 : (GLchan) ((i) >> 15)) #define UINT_TO_CHAN(i) ((GLchan) ((i) >> 16)) -#define CHAN_TO_FLOAT(c) ((GLfloat) ((c) * (1.0 / CHAN_MAXF))) +#define CHAN_TO_FLOAT(c) ((GLfloat) ((c) * (1.0 / CHAN_MAXF) + 0.5F)) +#define FLOAT_TO_CHAN(f) ((GLchan) IROUND((f) * CHAN_MAXF)) -#define FLOAT_COLOR_TO_CHAN(c, f) \ - c = ((GLchan) FloatToInt(CLAMP(f, 0.0F, 1.0F) * CHAN_MAXF + 0.5F)) +#define CLAMPED_FLOAT_TO_CHAN(c, f) \ + c = ((GLchan) IROUND((f) * CHAN_MAXF)) +#define UNCLAMPED_FLOAT_TO_CHAN(c, f) \ + c = ( (GLchan) IROUND( CLAMP(f, 0.0, 1.0) * CHAN_MAXF) ) #define COPY_CHAN4(DST, SRC) COPY_4V(DST, SRC) -#define CHAN_PRODUCT(a, b) ( (GLchan) ((((GLint) (a)) * ((GLint) (b))) / 65535) ) +#define CHAN_PRODUCT(a, b) ((GLchan) ((((GLint) (a)) * ((GLint) (b))) / 65535)) + #elif CHAN_BITS == 32 @@ -142,8 +95,10 @@ #define UINT_TO_CHAN(i) ((GLfloat) ((i) * (1.0F / 4294967295.0F))) #define CHAN_TO_FLOAT(c) (c) +#define FLOAT_TO_CHAN(f) (f) -#define FLOAT_COLOR_TO_CHAN(c, f) c = f +#define CLAMPED_FLOAT_COLOR_TO_CHAN(c, f) c = (f) +#define UNCLAMPED_FLOAT_TO_CHAN(c, f) c = (f) #define COPY_CHAN4(DST, SRC) COPY_4V(DST, SRC) @@ -156,41 +111,16 @@ #endif -#define FLOAT_RGB_TO_CHAN_RGB(dst, f) \ -do { \ - FLOAT_COLOR_TO_CHAN(dst[0], f[0]); \ - FLOAT_COLOR_TO_CHAN(dst[1], f[1]); \ - FLOAT_COLOR_TO_CHAN(dst[2], f[2]); \ -} while(0) -#define FLOAT_RGBA_TO_CHAN_RGBA(c, f) \ +/* + * Convert 3 channels at once. + */ +#define FLOAT_RGB_TO_CHAN_RGB(dst, f) \ do { \ - FLOAT_COLOR_TO_CHAN(c[0], f[0]); \ - FLOAT_COLOR_TO_CHAN(c[1], f[1]); \ - FLOAT_COLOR_TO_CHAN(c[2], f[2]); \ - FLOAT_COLOR_TO_CHAN(c[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]); \ } while(0) -#if CHAN_BITS == 32 - -#define FLOAT_TO_CHAN(f) (f) -#define DOUBLE_TO_CHAN(f) ((GLfloat) (f)) -#define UNCLAMPED_FLOAT_TO_CHAN(f) (f) -#define UNCLAMPED_DOUBLE_TO_CHAN(f) ((GLfloat) (f)) - -#else - -#define FLOAT_TO_CHAN(f) ( (GLchan) FloatToInt((f) * CHAN_MAXF + 0.5F) ) -#define DOUBLE_TO_CHAN(f) ( (GLchan) FloatToInt((f) * CHAN_MAXF + 0.5F) ) - -#define UNCLAMPED_FLOAT_TO_CHAN(f) \ - ( (GLchan) FloatToInt( CLAMP(f, 0.0, 1.0) * CHAN_MAXF + 0.5F) ) - -#define UNCLAMPED_DOUBLE_TO_CHAN(f) \ - ( (GLchan) FloatToInt( CLAMP(f, 0.0, 1.0) * CHAN_MAXF + 0.5F) ) - -#endif - - #endif /* COLORMAC_H */ -- cgit v1.2.3