From 853bda3e7c4dfa7d8cc462729f6a3dce89e44963 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 9 Dec 2003 01:53:03 +0000 Subject: Update NEED_SECONDARY_COLOR macro to test if either vertex/fragment programs are enabled and if they need secondary color input register. Patch by Karl Rasche, with tweaks by Brian. --- src/mesa/swrast/s_span.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mesa/swrast/s_span.c') diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c index 769b551e71..118cec47e3 100644 --- a/src/mesa/swrast/s_span.c +++ b/src/mesa/swrast/s_span.c @@ -1207,7 +1207,7 @@ _swrast_write_texture_span( GLcontext *ctx, struct sw_span *span) span->primitive == GL_POLYGON || span->primitive == GL_BITMAP); ASSERT(span->end <= MAX_WIDTH); ASSERT((span->interpMask & span->arrayMask) == 0); - ASSERT(ctx->Texture._EnabledCoordUnits); + ASSERT(ctx->Texture._EnabledCoordUnits || ctx->FragmentProgram.Enabled); /* printf("%s() interp 0x%x array 0x%x\n", __FUNCTION__, span->interpMask, span->arrayMask); -- cgit v1.2.3