From: Brian Paul <brianp@vmware.com>
Date: Tue, 27 Jan 2009 16:49:27 +0000 (-0700)
Subject: mesa: move call to _mesa_update_framebuffer_visual()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=38768dbc76f4963587a90823f73a1a2d981f63e6;p=mesa.git

mesa: move call to _mesa_update_framebuffer_visual()

Update the visual info in the _mesa_test_framebuffer_completeness()
function when we've determined the FBO to be "complete".

Fixes regression seen in progs/demos/shadowtex.c
---

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index c16ac0f0093..1a191cd288c 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -630,6 +630,9 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
        */
       fb->Width = minWidth;
       fb->Height = minHeight;
+
+      /* finally, update the visual info for the framebuffer */
+      _mesa_update_framebuffer_visual(fb);
    }
 }
 
diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index 2d7e3b05038..52fd3c9d819 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -795,7 +795,6 @@ update_framebuffer(GLcontext *ctx, struct gl_framebuffer *fb)
        */
       if (fb->_Status != GL_FRAMEBUFFER_COMPLETE) {
          _mesa_test_framebuffer_completeness(ctx, fb);
-         _mesa_update_framebuffer_visual(fb);
       }
    }