From 65a66f5bc37383c00423c21baf8ba9d6771e0259 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 27 Nov 2004 22:47:59 +0000 Subject: Remove _mesa_ResizeBuffersMESA() call from _mesa_set_viewport(). Now, the driver's Viewport routine should call _mesa_ResizeBuffersMESA() if necessary. Cleaned up code related to GLframebuffer width/height initialization. Set initial viewport/scissor params in _mesa_make_current2(), instead of in the drivers' MakeCurrent functions. --- src/mesa/drivers/dri/r128/r128_context.c | 6 ------ src/mesa/drivers/dri/r128/r128_state.c | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'src/mesa/drivers/dri/r128') diff --git a/src/mesa/drivers/dri/r128/r128_context.c b/src/mesa/drivers/dri/r128/r128_context.c index 287f041a81..2f417d9097 100644 --- a/src/mesa/drivers/dri/r128/r128_context.c +++ b/src/mesa/drivers/dri/r128/r128_context.c @@ -341,13 +341,7 @@ r128MakeCurrent( __DRIcontextPrivate *driContextPriv, (GLframebuffer *) driDrawPriv->driverPrivate, (GLframebuffer *) driReadPriv->driverPrivate ); - newR128Ctx->new_state |= R128_NEW_WINDOW | R128_NEW_CLIP; - - if ( !newR128Ctx->glCtx->Viewport.Width ) { - _mesa_set_viewport(newR128Ctx->glCtx, 0, 0, - driDrawPriv->w, driDrawPriv->h); - } } else { _mesa_make_current( 0, 0 ); } diff --git a/src/mesa/drivers/dri/r128/r128_state.c b/src/mesa/drivers/dri/r128/r128_state.c index 4e43629f49..320865c67b 100644 --- a/src/mesa/drivers/dri/r128/r128_state.c +++ b/src/mesa/drivers/dri/r128/r128_state.c @@ -41,6 +41,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "r128_tex.h" #include "context.h" +#include "buffers.h" #include "enums.h" #include "colormac.h" #include "swrast/swrast.h" @@ -664,6 +665,8 @@ static void r128Viewport( GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height ) { + /* update size of Mesa/software ancillary buffers */ + _mesa_ResizeBuffersMESA(); r128CalcViewport( ctx ); } -- cgit v1.2.3