Mesa (mesa_7_6_branch): r600: use CB_TARGET_MASK instead of CB_SHADER_MASK for setting color mask

[Alex Deucher]

Module: Mesa
Branch: mesa_7_6_branch
Commit: bf68e54a4d69bdd9a01656919d3cd752c96157b3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf68e54a4d69bdd9a01656919d3cd752c96157b3

Author: Andre Maasikas <amaasikas at gmail.com>
Date:   Mon Sep 28 11:23:49 2009 +0300

r600: use CB_TARGET_MASK instead of CB_SHADER_MASK for setting color mask

makes blend functions work better

Signed-off-by: Dave Airlie <airlied at linux.ie>

---

 src/mesa/drivers/dri/r600/r700_state.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/r600/r700_state.c b/src/mesa/drivers/dri/r600/r700_state.c
index 0d1f906..244a016 100644
--- a/src/mesa/drivers/dri/r600/r700_state.c
+++ b/src/mesa/drivers/dri/r600/r700_state.c
@@ -745,9 +745,9 @@ static void r700ColorMask(GLcontext * ctx,
 			     (b ? 4 : 0) |
 			     (a ? 8 : 0));
 
-	if (mask != r700->CB_SHADER_MASK.u32All) {
+	if (mask != r700->CB_TARGET_MASK.u32All) {
 		R600_STATECHANGE(context, cb);
-		SETfield(r700->CB_SHADER_MASK.u32All, mask, OUTPUT0_ENABLE_shift, OUTPUT0_ENABLE_mask);
+		SETfield(r700->CB_TARGET_MASK.u32All, mask, TARGET0_ENABLE_shift, TARGET0_ENABLE_mask);
 	}
 }
 
@@ -1758,7 +1758,7 @@ void r700InitState(GLcontext * ctx) //-------------------
     r700->CB_CLRCMP_MSK.u32All = 0xFFFFFFFF;
 
     /* screen/window/view */
-    SETfield(r700->CB_TARGET_MASK.u32All, 0xF, (4 * id), TARGET0_ENABLE_mask);
+    SETfield(r700->CB_SHADER_MASK.u32All, 0xF, (4 * id), OUTPUT0_ENABLE_mask);
 
     context->radeon.hw.all_dirty = GL_TRUE;