diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2001-01-24 00:04:58 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2001-01-24 00:04:58 +0000 |
| commit | 74b493a5e61237de081a438e774e5d8139d4c6b7 (patch) | |
| tree | a8bc94a65bacc67b9b1473f91a2bd84cd2b25937 /src/mesa/main/attrib.c | |
| parent | 125fddc31dc9959901d9f1ece693b09f04426d48 (diff) | |
Lots of GLchan datatype changes.
Added GLvector4us datatype in math/m_vector.[ch]
Added _math_trans_4us() in math/m_translate.[ch]
Choose GLvector4ub, GLvector4us, GLvector4f at compile time based on CHAN_BITS.
Made Driver.ClearColor() and Driver.ClearIndex() optional driver functions.
Changed args to Driver.ClearColor(), updated drivers.
Reordered files in Makefile.X11
Diffstat (limited to 'src/mesa/main/attrib.c')
| -rw-r--r-- | src/mesa/main/attrib.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index e669ff11d5..2a335625a4 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -1,4 +1,4 @@ -/* $Id: attrib.c,v 1.40 2001/01/23 23:39:36 brianp Exp $ */ +/* $Id: attrib.c,v 1.41 2001/01/24 00:04:58 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -589,11 +589,7 @@ _mesa_PopAttrib(void) ctx->Driver.LogicOpcode( ctx, ctx->Color.LogicOp ); } if (ctx->Visual.rgbMode) { - GLchan r = (GLint) (ctx->Color.ClearColor[0] * CHAN_MAXF); - GLchan g = (GLint) (ctx->Color.ClearColor[1] * CHAN_MAXF); - GLchan b = (GLint) (ctx->Color.ClearColor[2] * CHAN_MAXF); - GLchan a = (GLint) (ctx->Color.ClearColor[3] * CHAN_MAXF); - (*ctx->Driver.ClearColor)( ctx, r, g, b, a ); + (*ctx->Driver.ClearColor)(ctx, ctx->Color.ClearColor); if ((ctx->Color.AlphaFunc != oldAlphaFunc || ctx->Color.AlphaRef != oldAlphaRef) && ctx->Driver.AlphaFunc) |