Mesa (master): r600g: fix logicop, the 3d ROP is the 2D rop shifted twice.

[Dave Airlie]

Module: Mesa
Branch: master
Commit: 76d0541e79d4fe2ffcb25b17f9dd540fafc14ba2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=76d0541e79d4fe2ffcb25b17f9dd540fafc14ba2

Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Sep  2 16:39:32 2010 +1000

r600g: fix logicop, the 3d ROP is the 2D rop shifted twice.

---

 src/gallium/drivers/r600/r600_state.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index 95611d1..66cab7d 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -1319,7 +1319,7 @@ static void r600_cb_cntl(struct r600_context *rctx, struct radeon_state *rstate)
 	}
 
 	if (pbs->logicop_enable) {
-		color_control |= (pbs->logicop_func) << 16;
+		color_control |= (pbs->logicop_func << 16) | (pbs->logicop_func << 20);
 	} else {
 		color_control |= (0xcc << 16);
 	}