diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2000-10-28 20:41:13 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2000-10-28 20:41:13 +0000 |
| commit | c893a015d8a50a38cd3f727d99835e7e7e2ccea9 (patch) | |
| tree | 49ceb3610b183301b64916d54fd74d13a5c3a31c /src/mesa/main/feedback.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/feedback.c')
| -rw-r--r-- | src/mesa/main/feedback.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c index f9de16b893..1a6b34d7fe 100644 --- a/src/mesa/main/feedback.c +++ b/src/mesa/main/feedback.c @@ -1,4 +1,4 @@ -/* $Id: feedback.c,v 1.12 2000/10/28 18:34:48 brianp Exp $ */ +/* $Id: feedback.c,v 1.13 2000/10/28 20:41:14 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -29,6 +29,7 @@ #include "all.h" #else #include "glheader.h" +#include "colormac.h" #include "context.h" #include "enums.h" #include "feedback.h" @@ -174,7 +175,10 @@ static void feedback_vertex( GLcontext *ctx, GLuint v, GLuint pv ) if (ctx->Light.ShadeModel == GL_SMOOTH) pv = v; - CHAN_RGBA_TO_FLOAT_RGBA( color, VB->ColorPtr->data[pv] ); + color[0] = CHAN_TO_FLOAT(VB->ColorPtr->data[pv][0]); + color[1] = CHAN_TO_FLOAT(VB->ColorPtr->data[pv][1]); + color[2] = CHAN_TO_FLOAT(VB->ColorPtr->data[pv][2]); + color[3] = CHAN_TO_FLOAT(VB->ColorPtr->data[pv][3]); if (VB->TexCoordPtr[texUnit]->size == 4 && VB->TexCoordPtr[texUnit]->data[v][3] != 0.0) { |