diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-26 10:35:11 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-26 10:35:11 +0100 |
| commit | eb4c088eb71f93b9639f4ff651523d794f1433f7 (patch) | |
| tree | 5e95635c1768d7d8e640b298f6c6fbe38cd3c395 /mesalib/src/mesa/state_tracker/st_manager.c | |
| parent | e6432710d8a586386b3c7025e845cf4f80830da3 (diff) | |
| download | vcxsrv-eb4c088eb71f93b9639f4ff651523d794f1433f7.tar.gz vcxsrv-eb4c088eb71f93b9639f4ff651523d794f1433f7.tar.bz2 vcxsrv-eb4c088eb71f93b9639f4ff651523d794f1433f7.zip | |
xwininfo xcb-proto mesa xserver git update 26 12 2012
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_manager.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_manager.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_manager.c b/mesalib/src/mesa/state_tracker/st_manager.c index 63920a39e..7efc17305 100644 --- a/mesalib/src/mesa/state_tracker/st_manager.c +++ b/mesalib/src/mesa/state_tracker/st_manager.c @@ -688,7 +688,9 @@ st_framebuffer_reuse_or_create(struct gl_framebuffer *fb, { struct st_framebuffer *cur = st_ws_framebuffer(fb), *stfb = NULL; - if (cur && cur->iface == stfbi) { + /* dummy framebuffers cant be used as st_framebuffer */ + if (cur && &cur->Base != _mesa_get_incomplete_framebuffer() && + cur->iface == stfbi) { /* reuse the current stfb */ st_framebuffer_reference(&stfb, cur); } @@ -779,7 +781,7 @@ st_manager_flush_frontbuffer(struct st_context *st) return; /* never a dummy fb */ - assert(stfb->iface); + assert(&stfb->Base != _mesa_get_incomplete_framebuffer()); stfb->iface->flush_front(stfb->iface, ST_ATTACHMENT_FRONT_LEFT); } |