From af808afbe7c6c066ba35248b881f2c2c69ba7e40 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sun, 12 Dec 2004 22:22:10 +0000 Subject: fix recursion problem introduced on Nov 27 --- src/mesa/drivers/dri/unichrome/via_context.c | 2 +- src/mesa/drivers/dri/unichrome/via_state.c | 2 +- src/mesa/drivers/dri/unichrome/via_state.h | 1 + 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 490f574ad1..562538abbf 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 4c78a3f263..4f75f08617 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 76d81c2cff..08f8a49af3 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); -- cgit v1.2.3