From ca8d91610f547b9c66f703e07356f6347a121516 Mon Sep 17 00:00:00 2001 From: "Xiang, Haihao" Date: Sat, 2 Feb 2008 00:56:51 +0800 Subject: [PATCH] mesa: re-define NEED_SECONDARY_COLOR. fix #14310. --- src/mesa/main/context.h | 2 ++ 1 file changed, 2 insertions(+) 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)) \ ) -- 2.30.2