mesa: re-define NEED_SECONDARY_COLOR. fix #14310.

2008-02-02 00:56:51 +08:00
parent 746db75cfb
commit ca8d91610f
1 changed files with 2 additions and 0 deletions
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -273,8 +273,10 @@ do {									\
     (CTX)->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)	\
    || (CTX)->Fog.ColorSumEnabled					\
    || ((CTX)->VertexProgram._Current &&				\
+        ((CTX)->VertexProgram._Current != (CTX)->VertexProgram._TnlProgram) &&    \
        ((CTX)->VertexProgram._Current->Base.InputsRead & VERT_BIT_COLOR1)) \
    || ((CTX)->FragmentProgram._Current &&				\
+        ((CTX)->FragmentProgram._Current != (CTX)->FragmentProgram._TexEnvProgram) &&  \
        ((CTX)->FragmentProgram._Current->Base.InputsRead & FRAG_BIT_COL1)) \
   )