Mesa (master): mesa: avoid extraneous _NEW_BUFFER changes in _mesa_BindFramebufferEXT()

[Brian Paul]

Module: Mesa
Branch: master
Commit: 18af75e5011cc31b52d62befba2cacfd353ce638
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=18af75e5011cc31b52d62befba2cacfd353ce638

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Nov  2 15:29:03 2009 -0700

mesa: avoid extraneous _NEW_BUFFER changes in _mesa_BindFramebufferEXT()

---

 src/mesa/main/fbobject.c |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 4c6528b..4229ede 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1228,8 +1228,6 @@ _mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer)
       return;
    }
 
-   FLUSH_CURRENT(ctx, _NEW_BUFFERS);
-
    if (framebuffer) {
       /* Binding a user-created framebuffer object */
       newFb = _mesa_lookup_framebuffer(ctx, framebuffer);
@@ -1268,12 +1266,14 @@ _mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer)
    /*
     * OK, now bind the new Draw/Read framebuffers, if they're changing.
     */
-
    if (bindReadBuf) {
-      if (ctx->ReadBuffer == newFbread)
+      if (ctx->ReadBuffer == newFbread) {
          bindReadBuf = GL_FALSE; /* no change */
-      else
+      }
+      else {
+         FLUSH_VERTICES(ctx, _NEW_BUFFERS);
          _mesa_reference_framebuffer(&ctx->ReadBuffer, newFbread);
+      }
    }
 
    if (bindDrawBuf) {
@@ -1282,10 +1282,13 @@ _mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer)
          check_end_texture_render(ctx, ctx->DrawBuffer);
       }
 
-      if (ctx->DrawBuffer == newFb)
+      if (ctx->DrawBuffer == newFb) {
          bindDrawBuf = GL_FALSE; /* no change */
-      else
+      }
+      else {
+         FLUSH_VERTICES(ctx, _NEW_BUFFERS);
          _mesa_reference_framebuffer(&ctx->DrawBuffer, newFb);
+      }
 
       if (newFb->Name != 0) {
          /* check if newly bound framebuffer has any texture attachments */