diff options
| author | Brian Paul <[email protected]> | 2000-10-28 20:41:13 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2000-10-28 20:41:13 +0000 |
| commit | c893a015d8a50a38cd3f727d99835e7e7e2ccea9 (patch) | |
| tree | 49ceb3610b183301b64916d54fd74d13a5c3a31c /src/mesa/main/eval.c | |
| parent | ba643a2094a1e844b6ce60f468057057557859ce (diff) | |
New colormac.h file for color-related macros.
Lot's of clean-up in macros.h and mmath.h
Diffstat (limited to 'src/mesa/main/eval.c')
| -rw-r--r-- | src/mesa/main/eval.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mesa/main/eval.c b/src/mesa/main/eval.c index da1ad431619..9a5bbc7c64d 100644 --- a/src/mesa/main/eval.c +++ b/src/mesa/main/eval.c @@ -1,8 +1,8 @@ -/* $Id: eval.c,v 1.11 2000/09/11 18:49:06 brianp Exp $ */ +/* $Id: eval.c,v 1.12 2000/10/28 20:41:14 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.3 + * Version: 3.5 * * Copyright (C) 1999-2000 Brian Paul All Rights Reserved. * @@ -42,6 +42,7 @@ #include "all.h" #else #include "glheader.h" +#include "colormac.h" #include "context.h" #include "eval.h" #include "macros.h" @@ -2110,7 +2111,7 @@ static GLvector4ub *eval1_color( GLvector4ub *dest, GLfloat u = (coord[i][0] - u1) * du; GLfloat fcolor[4]; horner_bezier_curve(map->Points, fcolor, u, 4, map->Order); - FLOAT_RGBA_TO_UBYTE_RGBA(to[i], fcolor); + FLOAT_RGBA_TO_CHAN_RGBA(to[i], fcolor); flags[i+1] |= VERT_RGBA; /* reset */ } @@ -2270,7 +2271,7 @@ static GLvector4ub *eval2_color( GLvector4ub *dest, GLfloat fcolor[4]; horner_bezier_surf(map->Points, fcolor, u, v, 4, map->Uorder, map->Vorder); - FLOAT_RGBA_TO_UBYTE_RGBA(to[i], fcolor); + FLOAT_RGBA_TO_CHAN_RGBA(to[i], fcolor); flags[i+1] |= VERT_RGBA; /* reset */ } |