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/mga/mga_xmesa.c | 5 ----- src/mesa/drivers/dri/mga/mgastate.c | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/mesa/drivers/dri/mga') diff --git a/src/mesa/drivers/dri/mga/mga_xmesa.c b/src/mesa/drivers/dri/mga/mga_xmesa.c index 8bed48c423..6fcef0c448 100644 --- a/src/mesa/drivers/dri/mga/mga_xmesa.c +++ b/src/mesa/drivers/dri/mga/mga_xmesa.c @@ -802,11 +802,6 @@ mgaMakeCurrent(__DRIcontextPrivate *driContextPriv, _mesa_make_current2(mmesa->glCtx, (GLframebuffer *) driDrawPriv->driverPrivate, (GLframebuffer *) driReadPriv->driverPrivate); - - if (!mmesa->glCtx->Viewport.Width) - _mesa_set_viewport(mmesa->glCtx, 0, 0, - driDrawPriv->w, driDrawPriv->h); - } else { _mesa_make_current(NULL, NULL); diff --git a/src/mesa/drivers/dri/mga/mgastate.c b/src/mesa/drivers/dri/mga/mgastate.c index 295d3f5a08..69cc0f33a7 100644 --- a/src/mesa/drivers/dri/mga/mgastate.c +++ b/src/mesa/drivers/dri/mga/mgastate.c @@ -28,6 +28,7 @@ #include "mtypes.h" +#include "buffers.h" #include "colormac.h" #include "dd.h" @@ -695,6 +696,8 @@ static void mgaViewport( GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height ) { + /* update size of Mesa/software ancillary buffers */ + _mesa_ResizeBuffersMESA(); mgaCalcViewport( ctx ); } -- cgit v1.2.3