fix varying interpolation
authorBrian <brian@nostromo.localnet.net>
Wed, 24 Jan 2007 21:13:36 +0000 (14:13 -0700)
committerBrian <brian@nostromo.localnet.net>
Wed, 24 Jan 2007 21:13:36 +0000 (14:13 -0700)
src/mesa/swrast/s_lines.c

index ff50724..7b2a52b 100644 (file)
@@ -198,6 +198,7 @@ draw_wide_line( GLcontext *ctx, SWspan *span, GLboolean xMajor )
 #define INTERP_Z
 #define INTERP_FOG
 #define INTERP_MULTITEX
+#define INTERP_VARYING
 #define RENDER_SPAN(span)                                      \
    if (ctx->Line.StippleFlag) {                                        \
       span.arrayMask |= SPAN_MASK;                             \
@@ -298,10 +299,12 @@ _swrast_choose_line( GLcontext *ctx )
          _swrast_choose_aa_line_function(ctx);
          ASSERT(swrast->Line);
       }
-      else if (ctx->Texture._EnabledCoordUnits) {
+      else if (ctx->Texture._EnabledCoordUnits
+             || ctx->FragmentProgram._Current) {
          /* textured lines */
          if (ctx->Texture._EnabledCoordUnits > 0x1
-             || NEED_SECONDARY_COLOR(ctx)) {
+             || NEED_SECONDARY_COLOR(ctx)
+             || ctx->FragmentProgram._Current) {
             /* multi-texture and/or separate specular color */
             USE(multitextured_line);
          }