i915tex: The intended triple buffering fix.

Making modifications while the editor spawned by git-commit was suspended
didn't have the intended effect.

2 files changed, 1 insertions, 27 deletions

diff --git a/src/mesa/drivers/dri/i915tex/intel_buffers.c b/src/mesa/drivers/dri/i915tex/intel_buffers.c
index c0b4f438be..62ff54b007 100644
--- a/src/mesa/drivers/dri/i915tex/intel_buffers.c
+++ b/src/mesa/drivers/dri/i915tex/intel_buffers.c
@@ -349,28 +349,6 @@ intelWindowMoved(struct intel_context *intel)
 
    /* Update Mesa's notion of window size */
    driUpdateFramebufferSize(ctx, dPriv);
-
-   /* Update size of third renderbuffer */
-   if (intel_fb->pf_num_pages == 3) {
-      struct gl_renderbuffer *rb = &intel_fb->color_rb[(intel_fb->pf_current_page
-						        + 2) % 3]->Base;
-
-      /* only resize if size is changing */
-         if (rb->Width != intel_fb->Base.Width ||
-	     rb->Height != intel_fb->Base.Height) {
-            /* could just as well pass rb->_ActualFormat here */
-            if (rb->AllocStorage(ctx, rb, rb->InternalFormat,
-				 intel_fb->Base.Width, intel_fb->Base.Height)) {
-               ASSERT(rb->Width == intel_fb->Base.Width);
-               ASSERT(rb->Height == intel_fb->Base.Height);
-            }
-            else {
-               _mesa_error(ctx, GL_OUT_OF_MEMORY, "Resizing framebuffer");
-               /* no return */
-            }
-         }
-   }
-
    intel_fb->Base.Initialized = GL_TRUE; /* XXX remove someday */
 
    /* Update hardware scissor */
diff --git a/src/mesa/drivers/dri/i915tex/intel_context.c b/src/mesa/drivers/dri/i915tex/intel_context.c
index 5c2cdf0c7d..acda7b1c16 100644
--- a/src/mesa/drivers/dri/i915tex/intel_context.c
+++ b/src/mesa/drivers/dri/i915tex/intel_context.c
@@ -581,11 +581,7 @@ intelMakeCurrent(__DRIcontextPrivate * driContextPriv,
       }
 
       /* set GLframebuffer size to match window, if needed */
-      if (intel_fb->Base.Width != driDrawPriv->w) {
-         _mesa_resize_framebuffer(&intel->ctx, &intel_fb->Base,
-                                  driDrawPriv->w, driDrawPriv->h);
-      }         
-      if (readFb->Width != driReadPriv->w) {
+      if (driReadPriv != driDrawPriv && readFb->Width != driReadPriv->w) {
          _mesa_resize_framebuffer(&intel->ctx, readFb,
                                   driReadPriv->w, driReadPriv->h);
       }