From 5ed4e35ba5d65c5b1fff8b2da0270b74ba1a065e Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 4 Oct 2006 15:22:11 +0000 Subject: use _swrast_span_default_color() in the disabled code too --- src/mesa/swrast/s_bitmap.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/mesa/swrast/s_bitmap.c b/src/mesa/swrast/s_bitmap.c index 5d0e68424c..25a1ef89d0 100644 --- a/src/mesa/swrast/s_bitmap.c +++ b/src/mesa/swrast/s_bitmap.c @@ -193,20 +193,8 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py, span.x = px; span.y = py; /*span.end = width;*/ - if (ctx->Visual.rgbMode) { - span.interpMask |= SPAN_RGBA; - span.red = FloatToFixed(ctx->Current.RasterColor[0] * CHAN_MAXF); - span.green = FloatToFixed(ctx->Current.RasterColor[1] * CHAN_MAXF); - span.blue = FloatToFixed(ctx->Current.RasterColor[2] * CHAN_MAXF); - span.alpha = FloatToFixed(ctx->Current.RasterColor[3] * CHAN_MAXF); - span.redStep = span.greenStep = span.blueStep = span.alphaStep = 0; - } - else { - span.interpMask |= SPAN_INDEX; - span.index = FloatToFixed(ctx->Current.RasterIndex); - span.indexStep = 0; - } + _swrast_span_default_color(ctx, &span); if (ctx->Depth.Test) _swrast_span_default_z(ctx, &span); if (swrast->_FogEnabled) -- cgit v1.2.3