From: Dave Airlie <airlied@redhat.com>
Date: Thu, 2 Sep 2010 06:39:32 +0000 (+1000)
Subject: r600g: fix logicop, the 3d ROP is the 2D rop shifted twice.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=76d0541e79d4fe2ffcb25b17f9dd540fafc14ba2;p=mesa.git

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

diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index 95611d17394..66cab7d7a6e 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);
 	}