mesa: Branch 'master'

[Michel Daenzer]

 src/mesa/drivers/dri/r300/r300_fragprog.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree b55f1ec9af30ddc5fa44818f85518fffe4580dc6 (from 3dd243c59eb48bcf330a5d667d93b93c1226eae2)
Author: Jerome Glisse <glisse at freedesktop.org>
Date:   Thu Jan 11 12:53:06 2007 +0100

    Fix typo from commit 1d312ae0137eb39bf74fac91eb97ed25c289a4ca .

diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.c b/src/mesa/drivers/dri/r300/r300_fragprog.c
index 179bc58..6e85f0b 100644
--- a/src/mesa/drivers/dri/r300/r300_fragprog.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog.c
@@ -463,7 +463,7 @@ static int swz_native(struct r300_fragme
 		      GLuint arbneg)
 {
 	/* Native swizzle, handle negation */
-	src = (src & ~REG_NEGS_SHIFT) |
+	src = (src & ~REG_NEGS_MASK) |
 		(((arbneg >> 3) & 1) << REG_NEGS_SHIFT);
 
 	if ((arbneg & 0x7) == 0x0) {