1 files changed, 4 insertions, 2 deletions
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);