new RGBA_LOGICOP_ENABLED() macro
This commit is contained in:
@@ -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 */
|
||||||
|
@@ -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));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user