From: Dave Airlie <airlied@redhat.com>
Date: Fri, 6 Aug 2010 04:54:24 +0000 (+1000)
Subject: r600g: fix targetmask to work correctly.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b8de7788a4b20c702b06402e2e6eed60467e2522;p=mesa.git

r600g: fix targetmask to work correctly.

At least this seems to fix the glean maskedClear test.
---

diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index b8d50452e66..e43e4afe55e 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -1179,12 +1179,11 @@ static int r600_cb_cntl(struct r600_context *rctx, struct radeon_state *rstate)
 	} else
 		color_control |= (0xcc << 16);
 
-	target_mask |= (pbs->rt[0].colormask);
 	for (i = 0; i < 8; i++) {
 		if (pbs->rt[i].blend_enable) {
 			color_control |= S_028808_TARGET_BLEND_ENABLE(1 << i);
-			target_mask |= (pbs->rt[0].colormask << (4 * i));
 		}
+		target_mask |= (pbs->rt[i].colormask << (4 * i));
 	}
 	r = radeon_state_init(rstate, rscreen->rw, R600_CB_CNTL_TYPE, R600_CB_CNTL);
 	if (r)