fix recursion problem introduced on Nov 27

diff --git a/src/mesa/drivers/dri/unichrome/via_context.c b/src/mesa/drivers/dri/unichrome/via_context.c
index 490f574..562538a 100644 (file)
--- a/src/mesa/drivers/dri/unichrome/via_context.c
+++ b/src/mesa/drivers/dri/unichrome/via_context.c
@@ -909,7 +909,7 @@ void viaXMesaWindowMoved(viaContextPtr vmesa)
            vmesa->drawXoffSaam = 0;
     }
     
-    vmesa->glCtx->Driver.Viewport(vmesa->glCtx,0 ,0 ,0 ,0);
+    viaCalcViewport(vmesa->glCtx);
 }
 
 GLboolean

diff --git a/src/mesa/drivers/dri/unichrome/via_state.c b/src/mesa/drivers/dri/unichrome/via_state.c
index 4c78a3f..4f75f08 100644 (file)
--- a/src/mesa/drivers/dri/unichrome/via_state.c
+++ b/src/mesa/drivers/dri/unichrome/via_state.c
@@ -437,7 +437,7 @@ void viaEmitDrawingRectangle(viaContextPtr vmesa)
 }
 
 
-static void viaCalcViewport(GLcontext *ctx)
+void viaCalcViewport(GLcontext *ctx)
 {
     viaContextPtr vmesa = VIA_CONTEXT(ctx);
     const GLfloat *v = ctx->Viewport._WindowMap.m;

diff --git a/src/mesa/drivers/dri/unichrome/via_state.h b/src/mesa/drivers/dri/unichrome/via_state.h
index 76d81c2..08f8a49 100644 (file)
--- a/src/mesa/drivers/dri/unichrome/via_state.h
+++ b/src/mesa/drivers/dri/unichrome/via_state.h
@@ -29,6 +29,7 @@
 
 extern void viaInitState(GLcontext *ctx);
 extern void viaInitStateFuncs(GLcontext *ctx);
+extern void viaCalcViewport(GLcontext *ctx);
 extern void viaPrintDirty(const char *msg, GLuint state);
 extern void viaChooseTextureState(GLcontext *ctx);
 extern void viaChooseColorState(GLcontext *ctx);