diff options
| author | Brian Paul <[email protected]> | 2004-12-18 22:03:07 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2004-12-18 22:03:07 +0000 |
| commit | a803b0c891404dcd7c376e91f6a033cd4e42abc3 (patch) | |
| tree | c9483a42773d1d98548f8e6ab5484f659afe0162 /src/mesa/swrast/s_lines.c | |
| parent | feac30256730614bd60debe2167202bccb577aea (diff) | |
Consolidate _swrast_write_texture_span() into _swrast_write_rgba_span().
Diffstat (limited to 'src/mesa/swrast/s_lines.c')
| -rw-r--r-- | src/mesa/swrast/s_lines.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/mesa/swrast/s_lines.c b/src/mesa/swrast/s_lines.c index a5a612335e0..20d32b25a0c 100644 --- a/src/mesa/swrast/s_lines.c +++ b/src/mesa/swrast/s_lines.c @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 5.1 + * Version: 6.3 * - * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -88,9 +88,7 @@ draw_wide_line( GLcontext *ctx, struct sw_span *span, GLboolean xMajor ) for (i = 0; i < span->end; i++) y[i]++; } - if ((span->interpMask | span->arrayMask) & SPAN_TEXTURE) - _swrast_write_texture_span(ctx, span); - else if ((span->interpMask | span->arrayMask) & SPAN_RGBA) + if (ctx->Visual.rgbMode) _swrast_write_rgba_span(ctx, span); else _swrast_write_index_span(ctx, span); @@ -109,9 +107,7 @@ draw_wide_line( GLcontext *ctx, struct sw_span *span, GLboolean xMajor ) for (i = 0; i < span->end; i++) x[i]++; } - if ((span->interpMask | span->arrayMask) & SPAN_TEXTURE) - _swrast_write_texture_span(ctx, span); - else if ((span->interpMask | span->arrayMask) & SPAN_RGBA) + if (ctx->Visual.rgbMode) _swrast_write_rgba_span(ctx, span); else _swrast_write_index_span(ctx, span); @@ -191,7 +187,7 @@ draw_wide_line( GLcontext *ctx, struct sw_span *span, GLboolean xMajor ) draw_wide_line(ctx, &span, (GLboolean)(dx > dy)); \ } \ else { \ - _swrast_write_texture_span(ctx, &span); \ + _swrast_write_rgba_span(ctx, &span); \ } #include "s_linetemp.h" @@ -212,7 +208,7 @@ draw_wide_line( GLcontext *ctx, struct sw_span *span, GLboolean xMajor ) draw_wide_line(ctx, &span, (GLboolean)(dx > dy)); \ } \ else { \ - _swrast_write_texture_span(ctx, &span); \ + _swrast_write_rgba_span(ctx, &span); \ } #include "s_linetemp.h" |