diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-12-18 22:03:07 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2004-12-18 22:03:07 +0000 |
| commit | a803b0c891404dcd7c376e91f6a033cd4e42abc3 (patch) | |
| tree | c9483a42773d1d98548f8e6ab5484f659afe0162 /src/mesa/swrast/s_pointtemp.h | |
| parent | feac30256730614bd60debe2167202bccb577aea (diff) | |
Consolidate _swrast_write_texture_span() into _swrast_write_rgba_span().
Diffstat (limited to 'src/mesa/swrast/s_pointtemp.h')
| -rw-r--r-- | src/mesa/swrast/s_pointtemp.h | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/mesa/swrast/s_pointtemp.h b/src/mesa/swrast/s_pointtemp.h index 25a6a31772..ef48d239ec 100644 --- a/src/mesa/swrast/s_pointtemp.h +++ b/src/mesa/swrast/s_pointtemp.h @@ -216,12 +216,7 @@ NAME ( GLcontext *ctx, const SWvertex *vert ) /* check if we need to flush */ if (span->end + (xmax-xmin+1) * (ymax-ymin+1) >= MAX_WIDTH || (swrast->_RasterMask & (BLEND_BIT | LOGIC_OP_BIT | MASKING_BIT))) { -#if FLAGS & (TEXTURE | SPRITE) - if (ctx->Texture._EnabledUnits) - _swrast_write_texture_span(ctx, span); - else - _swrast_write_rgba_span(ctx, span); -#elif FLAGS & RGBA +#if FLAGS & RGBA _swrast_write_rgba_span(ctx, span); #else _swrast_write_index_span(ctx, span); @@ -238,12 +233,7 @@ NAME ( GLcontext *ctx, const SWvertex *vert ) /* check if we need to flush */ if (count + (xmax-xmin+1) >= MAX_WIDTH) { span->end = count; -#if FLAGS & (TEXTURE | SPRITE) - if (ctx->Texture._EnabledUnits) - _swrast_write_texture_span(ctx, span); - else - _swrast_write_rgba_span(ctx, span); -#elif FLAGS & RGBA +#if FLAGS & RGBA _swrast_write_rgba_span(ctx, span); #else _swrast_write_index_span(ctx, span); @@ -364,12 +354,7 @@ NAME ( GLcontext *ctx, const SWvertex *vert ) /* check if we need to flush */ if (span->end >= MAX_WIDTH || (swrast->_RasterMask & (BLEND_BIT | LOGIC_OP_BIT | MASKING_BIT))) { -#if FLAGS & (TEXTURE | SPRITE) - if (ctx->Texture._EnabledUnits) - _swrast_write_texture_span(ctx, span); - else - _swrast_write_rgba_span(ctx, span); -#elif FLAGS & RGBA +#if FLAGS & RGBA _swrast_write_rgba_span(ctx, span); #else _swrast_write_index_span(ctx, span); |