diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2002-01-28 03:42:28 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2002-01-28 03:42:28 +0000 |
| commit | 7956292a765910077f50352d7cd0174e1e66d26c (patch) | |
| tree | 59fa9504eaa4828c7073273d93d42914ce9f5e44 /src/mesa/swrast/s_fog.c | |
| parent | f1e236987829393c81dc86ea19cb49eefe190317 (diff) | |
More span improvements. Removed _mesa_write_monocolor_span().
Removed last of span.filled* flags and Klaus's macros.
More simplification of triangle functions.
Diffstat (limited to 'src/mesa/swrast/s_fog.c')
| -rw-r--r-- | src/mesa/swrast/s_fog.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/swrast/s_fog.c b/src/mesa/swrast/s_fog.c index e123ff5d9a..2c3b7878b7 100644 --- a/src/mesa/swrast/s_fog.c +++ b/src/mesa/swrast/s_fog.c @@ -1,4 +1,4 @@ -/* $Id: s_fog.c,v 1.19 2002/01/28 00:07:33 brianp Exp $ */ +/* $Id: s_fog.c,v 1.20 2002/01/28 03:42:28 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -87,7 +87,7 @@ _mesa_fog_rgba_pixels( const GLcontext *ctx, struct sw_span *span, ASSERT(ctx->Fog.Enabled); ASSERT(span->interpMask & SPAN_FOG); - ASSERT(span->filledColor == GL_TRUE || (span->arrayMask & SPAN_RGBA)); + ASSERT(span->arrayMask & SPAN_RGBA); UNCLAMPED_FLOAT_TO_CHAN(rFog, ctx->Fog.Color[RCOMP]); UNCLAMPED_FLOAT_TO_CHAN(gFog, ctx->Fog.Color[GCOMP]); @@ -120,7 +120,7 @@ _mesa_fog_rgba_pixels_with_array( const GLcontext *ctx, struct sw_span *span, ASSERT(fog != NULL); ASSERT(ctx->Fog.Enabled); - ASSERT(span->filledColor == GL_TRUE || (span->arrayMask & SPAN_RGBA)); + ASSERT(span->arrayMask & SPAN_RGBA); UNCLAMPED_FLOAT_TO_CHAN(rFog, ctx->Fog.Color[RCOMP]); UNCLAMPED_FLOAT_TO_CHAN(gFog, ctx->Fog.Color[GCOMP]); @@ -209,7 +209,7 @@ _mesa_fog_ci_pixels_with_array( const GLcontext *ctx, struct sw_span *span, ASSERT(fog != NULL); ASSERT(ctx->Fog.Enabled); - ASSERT((span->filledColor == GL_TRUE) || (span->arrayMask & SPAN_INDEX)); + ASSERT(span->arrayMask & SPAN_INDEX); for (i = span->start; i < span->end; i++) { const GLfloat f = CLAMP(fog[i], 0.0F, 1.0F); |