Instead of calling _mesa_ResizeBuffersMESA() in the Viewport function,

call driUpdateFramebufferSize() when window size/position changes.

2 files changed, 5 insertions, 4 deletions

diff --git a/src/mesa/drivers/dri/ffb/ffb_state.c b/src/mesa/drivers/dri/ffb/ffb_state.c
index 85c2fb5e8bf..b81d94de252 100644
--- a/src/mesa/drivers/dri/ffb/ffb_state.c
+++ b/src/mesa/drivers/dri/ffb/ffb_state.c
@@ -26,7 +26,6 @@
  */
 
 #include "mtypes.h"
-#include "buffers.h"
 #include "colormac.h"
 #include "mm.h"
 #include "ffb_dd.h"
@@ -450,8 +449,6 @@ void ffbCalcViewport(GLcontext *ctx)
 static void ffbDDViewport(GLcontext *ctx, GLint x, GLint y,
 			  GLsizei width, GLsizei height)
 {
-	/* update size of Mesa/software ancillary buffers */
-	_mesa_ResizeBuffersMESA();
 	ffbCalcViewport(ctx);
 }
 
diff --git a/src/mesa/drivers/dri/ffb/ffb_xmesa.c b/src/mesa/drivers/dri/ffb/ffb_xmesa.c
index baf4885a3be..ab2a6688bab 100644
--- a/src/mesa/drivers/dri/ffb/ffb_xmesa.c
+++ b/src/mesa/drivers/dri/ffb/ffb_xmesa.c
@@ -59,6 +59,8 @@
 
 #include "drm_sarea.h"
 
+#include "drirenderbuffer.h"
+
 static GLboolean
 ffbInitDriver(__DRIscreenPrivate *sPriv)
 {
@@ -595,9 +597,11 @@ void ffbXMesaUpdateState(ffbContextPtr fmesa)
 		GLcontext *ctx = fmesa->glCtx;
 
 		ffbCalcViewport(ctx);
-		if (ctx->Polygon.StippleFlag)
+		driUpdateFramebufferSize(ctx, dPriv);
+		if (ctx->Polygon.StippleFlag) {
 			ffbXformAreaPattern(fmesa,
 					    (const GLubyte *)ctx->PolygonStipple);
+		}
 	}
 }