summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2004-12-12 22:22:10 +0000
committerBrian Paul <[email protected]>2004-12-12 22:22:10 +0000
commitaf808afbe7c6c066ba35248b881f2c2c69ba7e40 (patch)
tree6a771f5f8c73c8895e2f2600291770fcb0905b7a
parent68d293b03535ca50daf70650b32db780f1718a3b (diff)
fix recursion problem introduced on Nov 27
-rw-r--r--src/mesa/drivers/dri/unichrome/via_context.c2
-rw-r--r--src/mesa/drivers/dri/unichrome/via_state.c2
-rw-r--r--src/mesa/drivers/dri/unichrome/via_state.h1
3 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/unichrome/via_context.c b/src/mesa/drivers/dri/unichrome/via_context.c
index 490f574ad1a..562538abbf9 100644
--- 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 4c78a3f263e..4f75f08617f 100644
--- 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 76d81c2cff9..08f8a49af3b 100644
--- 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);