fix regression with fallbacks from recent commits

This commit is contained in:
Keith Whitwell 2004-12-30 14:32:19 +00:00
parent 6fcc6c4965
commit 18551e75ea
2 changed files with 6 additions and 6 deletions

View File

@ -1555,10 +1555,8 @@ void viaValidateState( GLcontext *ctx )
if (vmesa->newState & _NEW_STENCIL)
viaChooseStencilState(ctx);
if (!vmesa->Fallback) {
vmesa->newEmitState |= vmesa->newState;
vmesa->newState = 0;
}
vmesa->newEmitState |= vmesa->newState;
vmesa->newState = 0;
if (VIA_DEBUG) fprintf(stderr, "%s - out\n", __FUNCTION__);
}

View File

@ -633,9 +633,11 @@ static void viaRunPipeline(GLcontext *ctx)
viaContextPtr vmesa = VIA_CONTEXT(ctx);
if (vmesa->newState) {
viaChooseVertexState(ctx);
viaChooseRenderState(ctx);
viaValidateState( ctx );
if (!vmesa->Fallback) {
viaChooseVertexState(ctx);
viaChooseRenderState(ctx);
}
}
_tnl_run_pipeline(ctx);