From 38768dbc76f4963587a90823f73a1a2d981f63e6 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 27 Jan 2009 09:49:27 -0700
Subject: 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
---
 src/mesa/main/fbobject.c    | 3 +++
 src/mesa/main/framebuffer.c | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index c16ac0f009..1a191cd288 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 2d7e3b0503..52fd3c9d81 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);
       }
    }
 
-- 
cgit v1.2.3