mesa: Branch 'master'

[Nan hai Zou]

 src/mesa/drivers/dri/i915tex/i915_state.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

New commits:
diff-tree 325196f548f8e46aa8fcc7b030e81ba939e7f6b7 (from 2dfb3a217f730d6783fb2ac8b73248dc682f923c)
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Fri Feb 2 14:37:24 2007 +0800

     push commit 2dfb3a217f730d6783fb2ac8b73248dc682f923c to i915tex

diff --git a/src/mesa/drivers/dri/i915tex/i915_state.c b/src/mesa/drivers/dri/i915tex/i915_state.c
index 7c742a7..78ae4bd 100644
--- a/src/mesa/drivers/dri/i915tex/i915_state.c
+++ b/src/mesa/drivers/dri/i915tex/i915_state.c
@@ -645,10 +645,12 @@ i915_update_fog(GLcontext * ctx)
          i915->state.Ctx[I915_CTXREG_LIS5] &= ~S5_FOG_ENABLE;
    }
 
-   if (enabled) {
-      _tnl_allow_vertex_fog(ctx, (i915->vertex_fog == I915_FOG_VERTEX));
-      _tnl_allow_pixel_fog(ctx, (i915->vertex_fog != I915_FOG_VERTEX));
-   }
+    /* always enbale pixel fog
+    * vertex fog use precaculted fog coord will conflict with appended
+    * fog program
+    */
+    _tnl_allow_vertex_fog( ctx, 0 );
+    _tnl_allow_pixel_fog( ctx, 1 );
 }
 
 static void