new RGBA_LOGICOP_ENABLED() macro

This commit is contained in:
Brian Paul
2006-11-02 17:49:47 +00:00
parent 12fe1b3a58
commit abc73d9cba
2 changed files with 9 additions and 3 deletions

View File

@@ -317,4 +317,12 @@ do { \
) )
/**
* Is RGBA LogicOp enabled?
*/
#define RGBA_LOGICOP_ENABLED(CTX) \
((CTX)->Color.ColorLogicOpEnabled || \
((CTX)->Color.BlendEnabled && (CTX)->Color.BlendEquationRGB == GL_LOGIC_OP))
#endif /* CONTEXT_H */ #endif /* CONTEXT_H */

View File

@@ -983,9 +983,7 @@ update_color(GLcontext *ctx)
/* This is needed to support 1.1's RGB logic ops AND /* This is needed to support 1.1's RGB logic ops AND
* 1.0's blending logicops. * 1.0's blending logicops.
*/ */
ctx->Color._LogicOpEnabled = (ctx->Color.ColorLogicOpEnabled || ctx->Color._LogicOpEnabled = RGBA_LOGICOP_ENABLED(ctx);
(ctx->Color.BlendEnabled &&
ctx->Color.BlendEquationRGB == GL_LOGIC_OP));
} }