summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian <[email protected]>2007-01-24 14:13:36 -0700
committerBrian <[email protected]>2007-01-24 14:13:36 -0700
commitccea3ff8a9eae16d2ca11b9cedef1318cffe3fb4 (patch)
tree5bf5bb7ba0ae94508491c9865bd11ccd901dcc28
parent0552abce0ec54dbb3f8de2fb9665fd5e58451543 (diff)
fix varying interpolation
-rw-r--r--src/mesa/swrast/s_lines.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_lines.c b/src/mesa/swrast/s_lines.c
index ff507249b08..7b2a52b4ffa 100644
--- a/src/mesa/swrast/s_lines.c
+++ b/src/mesa/swrast/s_lines.c
@@ -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);
}