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 490f574ad1aa4fca47a2e9ee64bce66ecad4601b..562538abbf9f32ee13e7403bfa06d12d1510550e 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 4c78a3f263e2c8687c1de1d4c5f8412e5baa7c41..4f75f08617f31c3371a589fa51ac82ea3627096c 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 76d81c2cff9fc6f71cd034f6cfe3d5a33c87d4f7..08f8a49af3b768540fae64691782d113b6d68c99 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);