From 699bc7b73d2fede77d3290f66c1ec355afd0373e Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sun, 29 Oct 2000 18:12:14 +0000 Subject: More GLchan color channel changes. Some header file re-org: Move matrix, vertex buffer structs to types.h to fix #include mess. Remove typedef, extern declarations from config.h --- src/mesa/main/colormac.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/mesa/main/colormac.h') diff --git a/src/mesa/main/colormac.h b/src/mesa/main/colormac.h index 5d125e2725..b69f52fbbb 100644 --- a/src/mesa/main/colormac.h +++ b/src/mesa/main/colormac.h @@ -1,4 +1,4 @@ -/* $Id: colormac.h,v 1.1 2000/10/28 20:41:13 brianp Exp $ */ +/* $Id: colormac.h,v 1.2 2000/10/29 18:12:14 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -175,12 +175,20 @@ do { \ #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 -- cgit v1.2.3