summaryrefslogtreecommitdiffstats
path: root/src/mesa/swrast/s_aalinetemp.h
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2002-04-12 15:39:58 +0000
committerBrian Paul <[email protected]>2002-04-12 15:39:58 +0000
commitb7f5e92f1749ce4601a758f66ddc64959f11742b (patch)
treeb9d7056d88824cb49eab181c3ca6290039e1886f /src/mesa/swrast/s_aalinetemp.h
parent9add9a21d8c51ee4238169265541fa9a40f0a8b0 (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_aalinetemp.h')
-rw-r--r--src/mesa/swrast/s_aalinetemp.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mesa/swrast/s_aalinetemp.h b/src/mesa/swrast/s_aalinetemp.h
index 27d525186dd..e1e12569155 100644
--- a/src/mesa/swrast/s_aalinetemp.h
+++ b/src/mesa/swrast/s_aalinetemp.h
@@ -1,4 +1,4 @@
-/* $Id: s_aalinetemp.h,v 1.18 2002/03/28 16:24:14 brianp Exp $ */
+/* $Id: s_aalinetemp.h,v 1.19 2002/04/12 15:39:58 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -101,11 +101,11 @@ NAME(plot)(GLcontext *ctx, struct LineInfo *line, int ix, int iy)
if (line->span.end == MAX_WIDTH) {
#if defined(DO_TEX) || defined(DO_MULTITEX)
- _mesa_write_texture_span(ctx, &line->span, GL_LINE);
+ _mesa_write_texture_span(ctx, &line->span);
#elif defined(DO_RGBA)
- _mesa_write_rgba_span(ctx, &line->span, GL_LINE);
+ _mesa_write_rgba_span(ctx, &line->span);
#else
- _mesa_write_index_span(ctx, &line->span, GL_LINE);
+ _mesa_write_index_span(ctx, &line->span);
#endif
line->span.end = 0; /* reset counter */
}
@@ -138,8 +138,8 @@ NAME(line)(GLcontext *ctx, const SWvertex *v0, const SWvertex *v1)
if (line.len == 0.0 || IS_INF_OR_NAN(line.len))
return;
- INIT_SPAN(line.span);
- line.span.arrayMask |= (SPAN_XY | SPAN_COVERAGE);
+ INIT_SPAN(line.span, GL_LINE, 0, 0, SPAN_XY | SPAN_COVERAGE);
+ /*line.span.arrayMask |= (SPAN_XY | SPAN_COVERAGE);*/
line.xAdj = line.dx / line.len * line.halfWidth;
line.yAdj = line.dy / line.len * line.halfWidth;
@@ -295,11 +295,11 @@ NAME(line)(GLcontext *ctx, const SWvertex *v0, const SWvertex *v1)
}
#if defined(DO_TEX) || defined(DO_MULTITEX)
- _mesa_write_texture_span(ctx, &line.span, GL_LINE);
+ _mesa_write_texture_span(ctx, &line.span);
#elif defined(DO_RGBA)
- _mesa_write_rgba_span(ctx, &line.span, GL_LINE);
+ _mesa_write_rgba_span(ctx, &line.span);
#else
- _mesa_write_index_span(ctx, &line.span, GL_LINE);
+ _mesa_write_index_span(ctx, &line.span);
#endif
}