2 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/gamma/gamma_state.c b/src/mesa/drivers/dri/gamma/gamma_state.c
index 7beabc69265..29f1a57959f 100644
--- a/src/mesa/drivers/dri/gamma/gamma_state.c
+++ b/src/mesa/drivers/dri/gamma/gamma_state.c
@@ -27,6 +27,7 @@
 
 #include "gamma_context.h"
 #include "gamma_macros.h"
+#include "buffers.h"
 #include "macros.h"
 #include "glint_dri.h"
 #include "colormac.h"
@@ -1098,6 +1099,8 @@ void gammaUpdateWindow( GLcontext *ctx )
 static void gammaDDViewport( GLcontext *ctx, GLint x, GLint y,
 			    GLsizei width, GLsizei height )
 {
+   /* update size of Mesa/software ancillary buffers */
+   _mesa_ResizeBuffersMESA();
    gammaUpdateWindow( ctx );
 }
 
diff --git a/src/mesa/drivers/dri/gamma/gamma_xmesa.c b/src/mesa/drivers/dri/gamma/gamma_xmesa.c
index 64ba0d909ac..00f6aa32aeb 100644
--- a/src/mesa/drivers/dri/gamma/gamma_xmesa.c
+++ b/src/mesa/drivers/dri/gamma/gamma_xmesa.c
@@ -225,11 +225,6 @@ newGammaCtx->new_state |= GAMMA_NEW_WINDOW; /* FIXME */
 	_mesa_make_current2( newGammaCtx->glCtx, 
 			  (GLframebuffer *) driDrawPriv->driverPrivate,
 			  (GLframebuffer *) driReadPriv->driverPrivate );
-
-	if (!newGammaCtx->glCtx->Viewport.Width) {
-	    _mesa_set_viewport(newGammaCtx->glCtx, 0, 0, 
-					driDrawPriv->w, driDrawPriv->h);
-	}
     } else {
 	_mesa_make_current( 0, 0 );
     }