diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2002-04-12 15:39:58 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2002-04-12 15:39:58 +0000 |
| commit | b7f5e92f1749ce4601a758f66ddc64959f11742b (patch) | |
| tree | b9d7056d88824cb49eab181c3ca6290039e1886f /src/mesa/swrast/s_bitmap.c | |
| parent | 9add9a21d8c51ee4238169265541fa9a40f0a8b0 (diff) | |
Klaus Niederkrueger's latest changes: use INIT_SPAN() to init span primitive
type, width, interp mask and array mask.
Diffstat (limited to 'src/mesa/swrast/s_bitmap.c')
| -rw-r--r-- | src/mesa/swrast/s_bitmap.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/mesa/swrast/s_bitmap.c b/src/mesa/swrast/s_bitmap.c index 6757fa496c..518e0587df 100644 --- a/src/mesa/swrast/s_bitmap.c +++ b/src/mesa/swrast/s_bitmap.c @@ -1,4 +1,4 @@ -/* $Id: s_bitmap.c,v 1.16 2002/02/17 17:30:23 brianp Exp $ */ +/* $Id: s_bitmap.c,v 1.17 2002/04/12 15:39:59 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -63,9 +63,9 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py, if (SWRAST_CONTEXT(ctx)->NewState) _swrast_validate_derived( ctx ); - INIT_SPAN(span); - span.arrayMask |= SPAN_XY; - span.end = width; + INIT_SPAN(span, GL_BITMAP, width, 0, SPAN_XY); + /*span.arrayMask |= SPAN_XY; + span.end = width;*/ if (ctx->Visual.rgbMode) { span.interpMask |= SPAN_RGBA; span.red = FloatToFixed(ctx->Current.RasterColor[0] * CHAN_MAXF); @@ -138,9 +138,9 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py, /* flush the span */ span.end = count; if (ctx->Visual.rgbMode) - _mesa_write_rgba_span(ctx, &span, GL_BITMAP); + _mesa_write_rgba_span(ctx, &span); else - _mesa_write_index_span(ctx, &span, GL_BITMAP); + _mesa_write_index_span(ctx, &span); span.end = 0; count = 0; } @@ -175,11 +175,11 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py, if (SWRAST_CONTEXT(ctx)->NewState) _swrast_validate_derived( ctx ); - INIT_SPAN(span); - span.arrayMask |= SPAN_MASK; /* we'll init span.mask[] */ + INIT_SPAN(span, GL_BITMAP, width, 0, SPAN_MASK); + /*span.arrayMask |= SPAN_MASK;*/ /* we'll init span.mask[] */ span.x = px; span.y = py; - span.end = width; + /*span.end = width;*/ if (ctx->Visual.rgbMode) { span.interpMask |= SPAN_RGBA; span.red = FloatToFixed(ctx->Current.RasterColor[0] * CHAN_MAXF); @@ -218,9 +218,9 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py, } if (ctx->Visual.rgbMode) - _mesa_write_rgba_span(ctx, &span, GL_BITMAP); + _mesa_write_rgba_span(ctx, &span); else - _mesa_write_index_span(ctx, &span, GL_BITMAP); + _mesa_write_index_span(ctx, &span); /* get ready for next row */ if (mask != 1) @@ -241,9 +241,9 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py, } if (ctx->Visual.rgbMode) - _mesa_write_rgba_span(ctx, &span, GL_BITMAP); + _mesa_write_rgba_span(ctx, &span); else - _mesa_write_index_span(ctx, &span, GL_BITMAP); + _mesa_write_index_span(ctx, &span); /* get ready for next row */ if (mask != 128) |