diff options
| author | Brian Paul <[email protected]> | 2010-10-05 14:32:59 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-10-05 14:33:17 -0600 |
| commit | 3d6eec0a87ee5549e817cdabb4b6424960678189 (patch) | |
| tree | 928d0e30171befe84aad2105d242f609e7350d0a | |
| parent | 2cf3199ee3b0014bc426bc3163dfa279c00eabb3 (diff) | |
st/mesa: replace assertion w/ conditional in framebuffer invalidation
https://bugs.freedesktop.org/show_bug.cgi?id=30632
NOTE: this is a candidate for the 7.9 branch.
| -rw-r--r-- | src/mesa/state_tracker/st_manager.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c index 66e32b4c9e8..cd418a03661 100644 --- a/src/mesa/state_tracker/st_manager.c +++ b/src/mesa/state_tracker/st_manager.c @@ -486,9 +486,18 @@ st_context_notify_invalid_framebuffer(struct st_context_iface *stctxi, stfb = st_ws_framebuffer(st->ctx->WinSysDrawBuffer); if (!stfb || stfb->iface != stfbi) stfb = st_ws_framebuffer(st->ctx->WinSysReadBuffer); - assert(stfb && stfb->iface == stfbi); - p_atomic_set(&stfb->revalidate, TRUE); + if (stfb && stfb->iface == stfbi) { + p_atomic_set(&stfb->revalidate, TRUE); + } + else { + /* This function is probably getting called when we've detected a + * change in a window's size but the currently bound context is + * not bound to that window. + * If the st_framebuffer_iface structure had a pointer to the + * corresponding st_framebuffer we'd be able to handle this. + */ + } } static void |