xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/r600_reg_r6xx.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f17657fdc83d8f4c0386d2c7dade98de5b94acbe
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Mon Nov 9 16:59:11 2009 -0500

    r600/r700: typo, fix mask of DB_ALPHA_TO_MASK
    
    noticed by glisse.

diff --git a/src/r600_reg_r6xx.h b/src/r600_reg_r6xx.h
index b4cc639..fec02ac 100644
--- a/src/r600_reg_r6xx.h
+++ b/src/r600_reg_r6xx.h
@@ -417,11 +417,11 @@ enum {
 	ALPHA_TO_MASK_ENABLE                              = 1 << 0,
 	ALPHA_TO_MASK_OFFSET0_mask                        = 0x03 << 8,
 	ALPHA_TO_MASK_OFFSET0_shift                       = 8,
-	ALPHA_TO_MASK_OFFSET1_mask                        = 0x03 << 8,
+	ALPHA_TO_MASK_OFFSET1_mask                        = 0x03 << 10,
 	ALPHA_TO_MASK_OFFSET1_shift                       = 10,
-	ALPHA_TO_MASK_OFFSET2_mask                        = 0x03 << 8,
+	ALPHA_TO_MASK_OFFSET2_mask                        = 0x03 << 12,
 	ALPHA_TO_MASK_OFFSET2_shift                       = 12,
-	ALPHA_TO_MASK_OFFSET3_mask                        = 0x03 << 8,
+	ALPHA_TO_MASK_OFFSET3_mask                        = 0x03 << 14,
 	ALPHA_TO_MASK_OFFSET3_shift                       = 14,
 
 //  SQ_VTX_CONSTANT_WORD2_0                               = 0x00038008,