diff options
| author | Nian Wu <nian@graphics.(none)> | 2007-02-25 09:40:28 -0800 |
|---|---|---|
| committer | Nian Wu <nian@graphics.(none)> | 2007-02-25 09:40:28 -0800 |
| commit | 675f7f627bec92315bf168a9c872ffc05f88c69c (patch) | |
| tree | 19c8f9cc509dc7ce73a0709832f34bf13a2c7425 /src/mesa/drivers/dri/i915/i915_state.c | |
| parent | 51bfb8fc8c78bb066d24e6ecbc20f00af7210386 (diff) | |
| parent | c080123998f28d9317331aec7ddfcd1074b29daf (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
Diffstat (limited to 'src/mesa/drivers/dri/i915/i915_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_state.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_state.c b/src/mesa/drivers/dri/i915/i915_state.c index 3cec6a2ddf..fd11e10652 100644 --- a/src/mesa/drivers/dri/i915/i915_state.c +++ b/src/mesa/drivers/dri/i915/i915_state.c @@ -611,10 +611,12 @@ void 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 i915Fogfv(GLcontext *ctx, GLenum pname, const GLfloat *param) |