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_aatritemp.h | |
| parent | feac30256730614bd60debe2167202bccb577aea (diff) | |
Consolidate _swrast_write_texture_span() into _swrast_write_rgba_span().
Diffstat (limited to 'src/mesa/swrast/s_aatritemp.h')
| -rw-r--r-- | src/mesa/swrast/s_aatritemp.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/mesa/swrast/s_aatritemp.h b/src/mesa/swrast/s_aatritemp.h index 53dd59fa9f..16e26d3f8a 100644 --- a/src/mesa/swrast/s_aatritemp.h +++ b/src/mesa/swrast/s_aatritemp.h @@ -1,9 +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"), @@ -348,11 +347,9 @@ span.y = iy; span.end = (GLuint) ix - (GLuint) startX; ASSERT(span.interpMask == 0); -#if defined(DO_MULTITEX) || defined(DO_TEX) - _swrast_write_texture_span(ctx, &span); -#elif defined(DO_RGBA) +#if defined(DO_RGBA) _swrast_write_rgba_span(ctx, &span); -#elif defined(DO_INDEX) +#else _swrast_write_index_span(ctx, &span); #endif } @@ -509,11 +506,9 @@ span.y = iy; span.end = n; ASSERT(span.interpMask == 0); -#if defined(DO_MULTITEX) || defined(DO_TEX) - _swrast_write_texture_span(ctx, &span); -#elif defined(DO_RGBA) +#if defined(DO_RGBA) _swrast_write_rgba_span(ctx, &span); -#elif defined(DO_INDEX) +#else _swrast_write_index_span(ctx, &span); #endif } |