mesa: Branch 'master'

[Roland Scheidegger]

 src/mesa/drivers/dri/i965/brw_vs_tnl.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree c5fe807e426988fc0ef931b417b5b3f621250595 (from 4b5d6c0435acd84c13e0db3785758fed0bc48fe1)
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Wed Mar 21 13:19:02 2007 +0100

    fix copy and paste bug from last commit in fog generation code for GL_LINEAR fog

diff --git a/src/mesa/drivers/dri/i965/brw_vs_tnl.c b/src/mesa/drivers/dri/i965/brw_vs_tnl.c
index e22a26b..dd1664b 100644
--- a/src/mesa/drivers/dri/i965/brw_vs_tnl.c
+++ b/src/mesa/drivers/dri/i965/brw_vs_tnl.c
@@ -1174,8 +1174,8 @@ static void build_fog( struct tnl_progra
 
       switch (p->state->fog_option) {
       case FOG_LINEAR: {
-	 emit_op3(p, OPCODE_MAD, tmp, 0, input, swizzle1(params,X), swizzle1(params,Y));
-	 emit_op2(p, OPCODE_MUL, tmp, 0, tmp, swizzle1(params,W)); 
+	 emit_op1(p, OPCODE_ABS, tmp, 0, input);
+	 emit_op3(p, OPCODE_MAD, tmp, 0, tmp, swizzle1(params,X), swizzle1(params,Y));
 	 emit_op2(p, OPCODE_MAX, tmp, 0, tmp, swizzle1(id,X)); /* saturate */
 	 emit_op2(p, OPCODE_MIN, fog, WRITEMASK_X, tmp, swizzle1(id,W));
 	 break;