Fix fd.o #9686, when fall into vertex fog,

fog factors are precomputed in t_vb_fog.c compute_fog_blend_factors,
  which is incompatible with appended fragment fog code.
  That will make GoogleEarth display abnormally.
  always use pixel fog.
This commit is contained in:
Zou Nan hai 2007-02-02 09:35:17 +08:00
parent af1d1e08e4
commit 2dfb3a217f
1 changed files with 6 additions and 4 deletions

View File

@ -611,10 +611,12 @@ void i915_update_fog( GLcontext *ctx )
i915->state.Ctx[I915_CTXREG_LIS5] &= ~S5_FOG_ENABLE; i915->state.Ctx[I915_CTXREG_LIS5] &= ~S5_FOG_ENABLE;
} }
if (enabled) { /* always enbale pixel fog
_tnl_allow_vertex_fog( ctx, (i915->vertex_fog == I915_FOG_VERTEX) ); * vertex fog use precaculted fog coord will conflict with appended
_tnl_allow_pixel_fog( ctx, (i915->vertex_fog != I915_FOG_VERTEX) ); * fog program
} */
_tnl_allow_vertex_fog( ctx, 0 );
_tnl_allow_pixel_fog( ctx, 1 );
} }
static void i915Fogfv(GLcontext *ctx, GLenum pname, const GLfloat *param) static void i915Fogfv(GLcontext *ctx, GLenum pname, const GLfloat *param)