diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-12-09 01:53:03 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-12-09 01:53:03 +0000 |
| commit | 853bda3e7c4dfa7d8cc462729f6a3dce89e44963 (patch) | |
| tree | 9fdbf1812276c8f1f2bb8e56d82d0d163e22eae0 /src/mesa/swrast/s_span.c | |
| parent | e8bec8832b50b8c2310e40951bea8bd78f89715c (diff) | |
| download | external_mesa3d-853bda3e7c4dfa7d8cc462729f6a3dce89e44963.zip external_mesa3d-853bda3e7c4dfa7d8cc462729f6a3dce89e44963.tar.gz external_mesa3d-853bda3e7c4dfa7d8cc462729f6a3dce89e44963.tar.bz2 | |
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.
Diffstat (limited to 'src/mesa/swrast/s_span.c')
| -rw-r--r-- | src/mesa/swrast/s_span.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c index 769b551..118cec4 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); |