mesa: re-define NEED_SECONDARY_COLOR. fix #14310.

diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index d7f92c463e51871a16c53fb316c14cb37a0e2138..bb6f3acf062ace9b16e5f990aaf1df33a94d2a37 100644 (file)
--- 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)) \
    )