From: Brian <brian.paul@tungstengraphics.com>
Date: Tue, 18 Dec 2007 23:10:11 +0000 (-0700)
Subject: fix NEED_SECONDARY_COLOR for vert/frag progs
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=441bab8f171b0678303ff46fc79f236c349aafdb;p=mesa.git

fix NEED_SECONDARY_COLOR for vert/frag progs
---

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