summaryrefslogtreecommitdiff
path: root/src/mesa/pipe/nv40
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2007-12-17 00:11:41 +1100
committerBen Skeggs <skeggsb@gmail.com>2007-12-17 00:11:41 +1100
commit66013a252f556447ca02a257bf15909817022433 (patch)
treec82e24dd754873cd344671fa585a7bb4eeed8c1b /src/mesa/pipe/nv40
parentf7e99bf22cd03a3d38b1d6263c96a0c2b85f29b7 (diff)
nv40: colormask thinko
Diffstat (limited to 'src/mesa/pipe/nv40')
-rw-r--r--src/mesa/pipe/nv40/nv40_state.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/pipe/nv40/nv40_state.c b/src/mesa/pipe/nv40/nv40_state.c
index c1a882feff..6a27854625 100644
--- a/src/mesa/pipe/nv40/nv40_state.c
+++ b/src/mesa/pipe/nv40/nv40_state.c
@@ -93,14 +93,16 @@ nv40_blend_state_bind(struct pipe_context *pipe, void *hwcso)
OUT_RING (cb->b_enable);
OUT_RING (cb->b_srcfunc);
OUT_RING (cb->b_dstfunc);
- BEGIN_RING(curie, NV40TCL_BLEND_EQUATION, 2);
+ BEGIN_RING(curie, NV40TCL_BLEND_EQUATION, 1);
OUT_RING (cb->b_eqn);
- OUT_RING (cb->c_mask);
} else {
BEGIN_RING(curie, NV40TCL_BLEND_ENABLE, 1);
OUT_RING (0);
}
+ BEGIN_RING(curie, NV40TCL_COLOR_MASK, 1);
+ OUT_RING (cb->c_mask);
+
if (cb->l_enable) {
BEGIN_RING(curie, NV40TCL_COLOR_LOGIC_OP_ENABLE, 2);
OUT_RING (cb->l_enable);