summaryrefslogtreecommitdiff
path: root/src/mesa/swrast/s_span.h
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2007-02-02 11:01:01 -0700
committerBrian <brian@yutani.localnet.net>2007-02-02 11:01:01 -0700
commit9ab512ad8cf3a12f4f7f8494fa99bc9389f217db (patch)
tree4026b0a39ff5c0403372f8f396786b9b592dcc48 /src/mesa/swrast/s_span.h
parent462d8f5fafcc5ac69ea89cac1222abadded642e2 (diff)
Replace color, z, w, texture interpolants with new generic attrib interpolants.
Diffstat (limited to 'src/mesa/swrast/s_span.h')
-rw-r--r--src/mesa/swrast/s_span.h26
1 files changed, 9 insertions, 17 deletions
diff --git a/src/mesa/swrast/s_span.h b/src/mesa/swrast/s_span.h
index f60d4279e1..26ef399df3 100644
--- a/src/mesa/swrast/s_span.h
+++ b/src/mesa/swrast/s_span.h
@@ -127,6 +127,7 @@ typedef struct sw_span_arrays
*/
typedef struct sw_span
{
+ /** Coord of first fragment in horizontal span/run */
GLint x, y;
/** Number of fragments in the span */
@@ -143,10 +144,17 @@ typedef struct sw_span
/**
* This bitmask (of \link SpanFlags SPAN_* flags\endlink) indicates
- * which of the x/xStep variables are relevant.
+ * which of the attrStart/StepX/StepY variables are relevant.
*/
GLbitfield interpMask;
+ /** Fragment attribute interpolants */
+ GLfloat attrStart[FRAG_ATTRIB_MAX][4]; /**< initial value */
+ GLfloat attrStepX[FRAG_ATTRIB_MAX][4]; /**< dvalue/dx */
+ GLfloat attrStepY[FRAG_ATTRIB_MAX][4]; /**< dvalue/dy */
+
+ /* XXX the rest of these will go away eventually... */
+
/* For horizontal spans, step is the partial derivative wrt X.
* For lines, step is the delta from one fragment to the next.
*/
@@ -169,24 +177,8 @@ typedef struct sw_span
#endif
GLfixed index, indexStep;
GLfixed z, zStep; /* XXX z should probably be GLuint */
- GLfloat tex[MAX_TEXTURE_COORD_UNITS][4]; /* s, t, r, q */
- GLfloat texStepX[MAX_TEXTURE_COORD_UNITS][4];
- GLfloat texStepY[MAX_TEXTURE_COORD_UNITS][4];
GLfixed intTex[2], intTexStep[2]; /* s, t only */
- /** Fragment attribute interpolants */
- GLfloat attrStart[FRAG_ATTRIB_MAX][4]; /**< initial value */
- GLfloat attrStepX[FRAG_ATTRIB_MAX][4]; /**< dvalue/dx */
- GLfloat attrStepY[FRAG_ATTRIB_MAX][4]; /**< dvalue/dy */
-
- /* partial derivatives wrt X and Y. */
- GLfloat dzdx, dzdy;
- GLfloat w, dwdx, dwdy;
- GLfloat drdx, drdy;
- GLfloat dgdx, dgdy;
- GLfloat dbdx, dbdy;
- GLfloat dadx, dady;
-
/**
* This bitmask (of \link SpanFlags SPAN_* flags\endlink) indicates
* which of the fragment arrays in the span_arrays struct are relevant.