From ff9d235042bb80daf0a6f5af41f7abcb1d552a80 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 14 Sep 2005 00:36:27 +0000
Subject: Instead of calling _mesa_ResizeBuffersMESA() in the Viewport
 function, call driUpdateFramebufferSize() when window size/position changes.

---
 src/mesa/drivers/dri/i830/i830_context.c | 3 ++-
 src/mesa/drivers/dri/i830/i830_state.c   | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/mesa/drivers/dri/i830')

diff --git a/src/mesa/drivers/dri/i830/i830_context.c b/src/mesa/drivers/dri/i830/i830_context.c
index 45fcbd2e3b..45c3ca57f4 100644
--- a/src/mesa/drivers/dri/i830/i830_context.c
+++ b/src/mesa/drivers/dri/i830/i830_context.c
@@ -63,7 +63,7 @@
 #include "i830_tris.h"
 #include "i830_ioctl.h"
 
-
+#include "drirenderbuffer.h"
 #include "utils.h"
 
 #define need_GL_ARB_multisample
@@ -573,6 +573,7 @@ void i830GetLock( i830ContextPtr imesa, GLuint flags )
     */
 
    if (sarea->ctxOwner != me) {
+      driUpdateFramebufferSize(imesa->glCtx, dPriv);
       imesa->upload_cliprects = GL_TRUE;
       imesa->dirty |= (I830_UPLOAD_CTX |
 		       I830_UPLOAD_BUFFERS | 
diff --git a/src/mesa/drivers/dri/i830/i830_state.c b/src/mesa/drivers/dri/i830/i830_state.c
index 13e2559662..55211f20a0 100644
--- a/src/mesa/drivers/dri/i830/i830_state.c
+++ b/src/mesa/drivers/dri/i830/i830_state.c
@@ -36,7 +36,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "glheader.h"
-#include "buffers.h"
 #include "context.h"
 #include "macros.h"
 #include "enums.h"
@@ -1227,8 +1226,6 @@ static void i830Viewport( GLcontext *ctx,
 			  GLint x, GLint y,
 			  GLsizei width, GLsizei height )
 {
-   /* update size of Mesa/software ancillary buffers */
-   _mesa_ResizeBuffersMESA();
    i830CalcViewport( ctx );
 }
 
-- 
cgit v1.2.3