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/rastpos.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/rastpos.c')
-rw-r--r-- | src/mesa/main/rastpos.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c index a262ed3002e..b4d36bbb0d1 100644 --- a/src/mesa/main/rastpos.c +++ b/src/mesa/main/rastpos.c @@ -1,4 +1,4 @@ -/* $Id: rastpos.c,v 1.9 2000/10/28 18:34:48 brianp Exp $ */ +/* $Id: rastpos.c,v 1.10 2000/10/28 20:41:14 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -30,6 +30,7 @@ #else #include "glheader.h" #include "clip.h" +#include "colormac.h" #include "context.h" #include "feedback.h" #include "light.h" @@ -91,8 +92,10 @@ static void raster_pos4f( GLcontext *ctx, else { /* use current color or index */ if (ctx->Visual.RGBAflag) { - CHAN_RGBA_TO_FLOAT_RGBA(ctx->Current.RasterColor, - ctx->Current.ByteColor); + ctx->Current.RasterColor[0] = CHAN_TO_FLOAT(ctx->Current.ByteColor[0]); + ctx->Current.RasterColor[1] = CHAN_TO_FLOAT(ctx->Current.ByteColor[1]); + ctx->Current.RasterColor[2] = CHAN_TO_FLOAT(ctx->Current.ByteColor[2]); + ctx->Current.RasterColor[3] = CHAN_TO_FLOAT(ctx->Current.ByteColor[3]); } else { ctx->Current.RasterIndex = ctx->Current.Index; |