r300: Further reduced the radeon_span.c diff.

[mesa.git] / src / mesa / swrast / s_context.c

diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index d4782aacb972eaa98ccdd453dba65f3c6daaed04..2f25edbd811c589e36c3d4939b8109d94da97318 100644 (file)
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -520,10 +520,12 @@ _swrast_update_fragment_attribs(GLcontext *ctx)
       GLuint u;
       attribsMask = 0x0;
 
+#if 0 /* not yet */
       if (ctx->Depth.Test)
          attribsMask |= FRAG_BIT_WPOS;
       if (NEED_SECONDARY_COLOR(ctx))
          attribsMask |= FRAG_BIT_COL1;
+#endif
       if (swrast->_FogEnabled)
          attribsMask |= FRAG_BIT_FOGC;
 
@@ -534,6 +536,13 @@ _swrast_update_fragment_attribs(GLcontext *ctx)
       }
    }
 
+   /* don't want to interpolate these generic attribs just yet */
+   /* XXX temporary */
+   attribsMask &= ~(FRAG_BIT_WPOS |
+                    FRAG_BIT_COL0 |
+                    FRAG_BIT_COL1 |
+                    FRAG_BIT_FOGC);
+
    /* Update _ActiveAttribs[] list */
    {
       GLuint i, num = 0;
@@ -910,7 +919,7 @@ _swrast_print_vertex( GLcontext *ctx, const SWvertex *v )
                   v->specular[0], v->specular[1],
                   v->specular[2], v->specular[3]);
 #endif
-      _mesa_debug(ctx, "fog %f\n", v->fog);
+      _mesa_debug(ctx, "fog %f\n", v->attrib[FRAG_ATTRIB_FOGC][0]);
       _mesa_debug(ctx, "index %d\n", v->index);
       _mesa_debug(ctx, "pointsize %f\n", v->pointSize);
       _mesa_debug(ctx, "\n");