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 c16ac0f0093d31998de895a7ad88fcdc4d855be5..1a191cd288cf2a7699a168049ab95180818d88f3 100644 (file)
--- 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 2d7e3b050385c1c2dbf8388ebcc6e032581ed28b..52fd3c9d819aa308b3e55fa0e61873ee81f4bfc9 100644 (file)
--- 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);
       }
    }