diff options
author | Roland Scheidegger <[email protected]> | 2005-10-18 13:09:53 +0000 |
---|---|---|
committer | Roland Scheidegger <[email protected]> | 2005-10-18 13:09:53 +0000 |
commit | 05e1a49ab4b0d34aba4bdf55ed7ffe5b6d4411f8 (patch) | |
tree | 7a41b441e2db555f37d406dde1e5ac118b95ec52 /src/mesa/drivers/dri/r200/r200_vtxfmt.c | |
parent | 730200303daabd603cd25b4c35099f2e6e5f9f8f (diff) |
on r200, don't emit fog coords when fog isn't actually enabled. Fix bug with vtxfmt not causing a fallback when fog coords are active.
Diffstat (limited to 'src/mesa/drivers/dri/r200/r200_vtxfmt.c')
-rw-r--r-- | src/mesa/drivers/dri/r200/r200_vtxfmt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_vtxfmt.c b/src/mesa/drivers/dri/r200/r200_vtxfmt.c index c5d1f131d06..d9af6bf5f85 100644 --- a/src/mesa/drivers/dri/r200/r200_vtxfmt.c +++ b/src/mesa/drivers/dri/r200/r200_vtxfmt.c @@ -662,9 +662,10 @@ static GLboolean check_vtx_fmt( GLcontext *ctx ) GLuint i; GLuint count[R200_MAX_TEXTURE_UNITS]; - if (rmesa->TclFallback || rmesa->vb.fell_back || ctx->CompileFlag) + if (rmesa->TclFallback || rmesa->vb.fell_back || ctx->CompileFlag || + (ctx->Fog.Enabled && (ctx->Fog.FogCoordinateSource == GL_FOG_COORD))) return GL_FALSE; - + if (ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT) ctx->Driver.FlushVertices( ctx, FLUSH_UPDATE_CURRENT ); |