summaryrefslogtreecommitdiff
path: root/src/mesa/swrast/swrast.h
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2002-04-12 15:39:58 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2002-04-12 15:39:58 +0000
commitb7f5e92f1749ce4601a758f66ddc64959f11742b (patch)
treeb9d7056d88824cb49eab181c3ca6290039e1886f /src/mesa/swrast/swrast.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/swrast.h')
-rw-r--r--src/mesa/swrast/swrast.h17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/mesa/swrast/swrast.h b/src/mesa/swrast/swrast.h
index a6c07e5655..7070569385 100644
--- a/src/mesa/swrast/swrast.h
+++ b/src/mesa/swrast/swrast.h
@@ -1,4 +1,4 @@
-/* $Id: swrast.h,v 1.21 2002/03/16 00:53:15 brianp Exp $ */
+/* $Id: swrast.h,v 1.22 2002/04/12 15:39:59 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -108,6 +108,9 @@ struct sw_span {
/* This flag indicates that only a part of the span is visible */
GLboolean writeAll;
+ /* either GL_POLYGON, GL_LINE, GL_POLYGON, GL_BITMAP */
+ GLenum primitive;
+
/**
* This bitmask (of SPAN_* flags) indicates which of the x/xStep
* variables are relevant.
@@ -168,11 +171,13 @@ struct sw_span {
};
-#define INIT_SPAN(S) \
-do { \
- S.interpMask = 0; \
- S.arrayMask = 0; \
- S.start = S.end = 0; \
+#define INIT_SPAN(S, PRIMITIVE, END, INTERP_MASK, ARRAY_MASK) \
+do { \
+ S.primitive = (PRIMITIVE); \
+ S.interpMask = (INTERP_MASK); \
+ S.arrayMask = (ARRAY_MASK); \
+ S.start = 0; \
+ S.end = (END); \
} while (0)