summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorXiang, Haihao <haihao.xiang@intel.com>2008-02-02 00:56:51 +0800
committerXiang, Haihao <haihao.xiang@intel.com>2008-02-02 00:56:51 +0800
commitca8d91610f547b9c66f703e07356f6347a121516 (patch)
tree7a8a7508d7da1e1807c5108f21dbd80de612f95b /src
parent746db75cfbdd760cb19d2dfd18b628aeb2fc3054 (diff)
mesa: re-define NEED_SECONDARY_COLOR. fix #14310.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/context.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index d7f92c463e..bb6f3acf06 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)) \
)