summaryrefslogtreecommitdiff
path: root/src/mesa/tnl/t_vb_render.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2001-01-03 15:59:30 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2001-01-03 15:59:30 +0000
commit6532db986883ea1a431c043126de4947465834a1 (patch)
treeafff13a66669d89ac029fc3183385c9b1f751bba /src/mesa/tnl/t_vb_render.c
parent3b399df6382d3cfb3cf9bfde4888878bebd2903f (diff)
More color macro clean-ups.
FLOAT_TO_CHAN() macro removed.
Diffstat (limited to 'src/mesa/tnl/t_vb_render.c')
-rw-r--r--src/mesa/tnl/t_vb_render.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/tnl/t_vb_render.c b/src/mesa/tnl/t_vb_render.c
index 1d0a1aaf15..b3fef23501 100644
--- a/src/mesa/tnl/t_vb_render.c
+++ b/src/mesa/tnl/t_vb_render.c
@@ -1,4 +1,4 @@
-/* $Id: t_vb_render.c,v 1.4 2000/12/28 22:11:06 keithw Exp $ */
+/* $Id: t_vb_render.c,v 1.5 2001/01/03 15:59:31 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -119,19 +119,19 @@ do { \
#if 1
-#define LINTERP_RGBA(nr, t, out, a, b) { \
+#define LINTERP_RGBA(nr, t, out, a, b) { \
int i; \
for (i = 0; i < nr; i++) { \
GLfloat fa = CHAN_TO_FLOAT(a[i]); \
GLfloat fb = CHAN_TO_FLOAT(b[i]); \
GLfloat fo = LINTERP(t, fa, fb); \
- FLOAT_COLOR_TO_CHAN(out[i], fo); \
+ CLAMPED_FLOAT_TO_CHAN(out[i], fo); \
} \
}
#else
-#define LINTERP_RGBA(nr, t, out, a, b) { \
+#define LINTERP_RGBA(nr, t, out, a, b) { \
int n; \
const GLuint ti = FloatToInt(t*256.0F); \
const GLubyte *Ib = (const GLubyte *)&a[0]; \