From: Xiang, Haihao <haihao.xiang@intel.com>
Date: Fri, 1 Feb 2008 16:56:51 +0000 (+0800)
Subject: mesa: re-define NEED_SECONDARY_COLOR. fix #14310.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ca8d91610f547b9c66f703e07356f6347a121516;p=mesa.git

mesa: re-define NEED_SECONDARY_COLOR. fix #14310.
---

diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index d7f92c463e5..bb6f3acf062 100644
--- 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)) \
    )