summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2004-12-30 14:32:19 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2004-12-30 14:32:19 +0000
commit18551e75ea20ad49a10309b4f7e9eeea76d45290 (patch)
tree1b7ff45ae5d57b6927230518526880d934679a32
parent6fcc6c49654d9e87fbcadba14bc2f45e9bdbf8f7 (diff)
fix regression with fallbacks from recent commits
-rw-r--r--src/mesa/drivers/dri/unichrome/via_state.c6
-rw-r--r--src/mesa/drivers/dri/unichrome/via_tris.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/unichrome/via_state.c b/src/mesa/drivers/dri/unichrome/via_state.c
index 0805610614..62cdee24c8 100644
--- a/src/mesa/drivers/dri/unichrome/via_state.c
+++ b/src/mesa/drivers/dri/unichrome/via_state.c
@@ -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__);
}
diff --git a/src/mesa/drivers/dri/unichrome/via_tris.c b/src/mesa/drivers/dri/unichrome/via_tris.c
index 862c827300..6dbbfe0343 100644
--- a/src/mesa/drivers/dri/unichrome/via_tris.c
+++ b/src/mesa/drivers/dri/unichrome/via_tris.c
@@ -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);