diff options
| author | Brian <brian.paul@tungstengraphics.com> | 2007-12-18 16:10:11 -0700 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2007-12-18 16:24:19 -0700 |
| commit | 441bab8f171b0678303ff46fc79f236c349aafdb (patch) | |
| tree | 70c430f843f6321e5e5020d093623091d2d740c8 | |
| parent | 85f5e6d7b903fee332a372f8fe1577f79c594276 (diff) | |
fix NEED_SECONDARY_COLOR for vert/frag progs
| -rw-r--r-- | src/mesa/main/context.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h index 099912aa15..d7f92c463e 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)) \ ) |