fix NEED_SECONDARY_COLOR for vert/frag progs
authorBrian <brian.paul@tungstengraphics.com>
Tue, 18 Dec 2007 23:10:11 +0000 (16:10 -0700)
committerBrian <brian.paul@tungstengraphics.com>
Tue, 18 Dec 2007 23:24:19 +0000 (16:24 -0700)
src/mesa/main/context.h

index 099912aa15259d707cc5c2977b0d15ba092b17ac..d7f92c463e51871a16c53fb316c14cb37a0e2138 100644 (file)
@@ -272,10 +272,10 @@ do {                                                                      \
    (((CTX)->Light.Enabled &&                                           \
      (CTX)->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)    \
     || (CTX)->Fog.ColorSumEnabled                                      \
-    || ((CTX)->VertexProgram._Enabled &&                               \
-        ((CTX)->VertexProgram.Current->Base.InputsRead & VERT_BIT_COLOR1)) \
-    || ((CTX)->FragmentProgram._Enabled &&                             \
-        ((CTX)->FragmentProgram.Current->Base.InputsRead & FRAG_BIT_COL1)) \
+    || ((CTX)->VertexProgram._Current &&                               \
+        ((CTX)->VertexProgram._Current->Base.InputsRead & VERT_BIT_COLOR1)) \
+    || ((CTX)->FragmentProgram._Current &&                             \
+        ((CTX)->FragmentProgram._Current->Base.InputsRead & FRAG_BIT_COL1)) \
    )