summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2006-11-02 17:49:47 +0000
committerBrian Paul <[email protected]>2006-11-02 17:49:47 +0000
commitabc73d9cba655479af493fabd13a488e5f7951eb (patch)
treec9960533183c15c91cd59f1b277913cd3dc08d8d /src/mesa
parent12fe1b3a580c267ccef53a5dbfd5183eaac1489b (diff)
new RGBA_LOGICOP_ENABLED() macro
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/context.h8
-rw-r--r--src/mesa/main/state.c4
2 files changed, 9 insertions, 3 deletions
diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index c72fe8a56ac..e7e0fda72ea 100644
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -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 */
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 1ced2a081e5..de513926de5 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -983,9 +983,7 @@ update_color(GLcontext *ctx)
/* This is needed to support 1.1's RGB logic ops AND
* 1.0's blending logicops.
*/
- ctx->Color._LogicOpEnabled = (ctx->Color.ColorLogicOpEnabled ||
- (ctx->Color.BlendEnabled &&
- ctx->Color.BlendEquationRGB == GL_LOGIC_OP));
+ ctx->Color._LogicOpEnabled = RGBA_LOGICOP_ENABLED(ctx);
}