fix regression with fallbacks from recent commits

diff --git a/src/mesa/drivers/dri/unichrome/via_state.c b/src/mesa/drivers/dri/unichrome/via_state.c
index 08056106140df6f09334b77b9d0accd304384967..62cdee24c8b19bcaf5ff1962b73e8476078a907e 100644 (file)
--- 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 862c827300f47e3a037cb61301cf5bf3e8d67e05..6dbbfe0343a2e263dafae5241713104b6df99cc8 100644 (file)
--- 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);