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/main/context.h

@@ -374,7 +374,12 @@ do {									\
 #define NEED_SECONDARY_COLOR(CTX)					\
    (((CTX)->Light.Enabled &&						\
      (CTX)->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)	\
-    || (CTX)->Fog.ColorSumEnabled)
+    || (CTX)->Fog.ColorSumEnabled					\
+    || ((CTX)->VertexProgram.Enabled &&					\
+        ((CTX)->VertexProgram.Current->InputsRead & VERT_BIT_COLOR1))	\
+    || ((CTX)->FragmentProgram.Enabled &&				\
+        ((CTX)->FragmentProgram.Current->InputsRead & FRAG_BIT_COL1))	\
+   )
 
 
 /**