summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2009-01-27 09:49:27 -0700
committerBrian Paul <[email protected]>2009-01-27 09:49:27 -0700
commit38768dbc76f4963587a90823f73a1a2d981f63e6 (patch)
tree5e2bb4930bc1a2c62accf54eb860a3015ab885ca /src/mesa
parent3cf7f9887ae9f26c006f88071cd69343e2c591e4 (diff)
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
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/fbobject.c3
-rw-r--r--src/mesa/main/framebuffer.c1
2 files changed, 3 insertions, 1 deletions
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);
}
}