diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2000-10-28 18:34:48 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2000-10-28 18:34:48 +0000 |
| commit | ba643a2094a1e844b6ce60f468057057557859ce (patch) | |
| tree | 27309b7362369d7339290f3702f4b7179be4c690 /src/mesa/main/attrib.c | |
| parent | a897b335bec7465ab688ef369c75b468b7251b05 (diff) | |
Basic work to support deep color channels:
Replace GLubyte with GLchan
Replace 255 with CHAN_MAX
Diffstat (limited to 'src/mesa/main/attrib.c')
| -rw-r--r-- | src/mesa/main/attrib.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 9cf1d3c509..2e970e9b08 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -1,8 +1,8 @@ -/* $Id: attrib.c,v 1.28 2000/09/28 22:44:30 brianp Exp $ */ +/* $Id: attrib.c,v 1.29 2000/10/28 18:34:48 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.3 + * Version: 3.5 * * Copyright (C) 1999-2000 Brian Paul All Rights Reserved. * @@ -568,7 +568,7 @@ _mesa_PopAttrib(void) { GLenum oldDrawBuffer = ctx->Color.DrawBuffer; GLenum oldAlphaFunc = ctx->Color.AlphaFunc; - GLubyte oldAlphaRef = ctx->Color.AlphaRef; + GLchan oldAlphaRef = ctx->Color.AlphaRef; GLenum oldBlendSrc = ctx->Color.BlendSrcRGB; GLenum oldBlendDst = ctx->Color.BlendDstRGB; GLenum oldLogicOp = ctx->Color.LogicOp; @@ -587,16 +587,16 @@ _mesa_PopAttrib(void) ctx->Driver.LogicOpcode( ctx, ctx->Color.LogicOp ); } if (ctx->Visual.RGBAflag) { - GLubyte r = (GLint) (ctx->Color.ClearColor[0] * 255.0F); - GLubyte g = (GLint) (ctx->Color.ClearColor[1] * 255.0F); - GLubyte b = (GLint) (ctx->Color.ClearColor[2] * 255.0F); - GLubyte a = (GLint) (ctx->Color.ClearColor[3] * 255.0F); + 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 ); if ((ctx->Color.AlphaFunc != oldAlphaFunc || ctx->Color.AlphaRef != oldAlphaRef) && ctx->Driver.AlphaFunc) (*ctx->Driver.AlphaFunc)( ctx, ctx->Color.AlphaFunc, - ctx->Color.AlphaRef / 255.0F); + ctx->Color.AlphaRef / CHAN_MAXF); if (ctx->Driver.ColorMask) { (*ctx->Driver.ColorMask)(ctx, ctx->Color.ColorMask[0], |