diff options
author | marha <marha@users.sourceforge.net> | 2011-03-12 15:21:19 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-03-12 15:21:19 +0000 |
commit | e0058f158bae56c5a10cad4f9ace808a27022a9d (patch) | |
tree | 0daf3e4bafd8a1c53f8228c41ffd1637c158bb29 /mesalib/src/mesa/main/context.h | |
parent | b639ce1e238ac06882d504aca591ab62475459c1 (diff) | |
parent | 77ec02adbc8f9657e7749b307d3cc86ccbd163ea (diff) | |
download | vcxsrv-e0058f158bae56c5a10cad4f9ace808a27022a9d.tar.gz vcxsrv-e0058f158bae56c5a10cad4f9ace808a27022a9d.tar.bz2 vcxsrv-e0058f158bae56c5a10cad4f9ace808a27022a9d.zip |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/context.h')
-rw-r--r-- | mesalib/src/mesa/main/context.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/mesalib/src/mesa/main/context.h b/mesalib/src/mesa/main/context.h index 160e795f7..ae4d6f7da 100644 --- a/mesalib/src/mesa/main/context.h +++ b/mesalib/src/mesa/main/context.h @@ -286,28 +286,4 @@ do { \ -/**
- * Is the secondary color needed?
- */
-#define NEED_SECONDARY_COLOR(CTX) \
- (((CTX)->Light.Enabled && \
- (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)) \
- )
-
-
-/**
- * Is RGBA LogicOp enabled?
- */
-#define RGBA_LOGICOP_ENABLED(CTX) \
- ((CTX)->Color.ColorLogicOpEnabled || \
- ((CTX)->Color.BlendEnabled && (CTX)->Color.Blend[0].EquationRGB == GL_LOGIC_OP))
-
-
#endif /* CONTEXT_H */
|