diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-01 16:36:19 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-01 16:36:19 +0200 |
| commit | 75becbf5e6dcd4667aa88665a1a681fb8620b2c4 (patch) | |
| tree | 4e6ed6cb893d9ea4c17172b17b1567cfd76cddb8 /mesalib/src/mesa/state_tracker/st_cb_blit.c | |
| parent | 32ccde45cc1f46a3bd72c44c4f3fcd03742dbb3c (diff) | |
| download | vcxsrv-75becbf5e6dcd4667aa88665a1a681fb8620b2c4.tar.gz vcxsrv-75becbf5e6dcd4667aa88665a1a681fb8620b2c4.tar.bz2 vcxsrv-75becbf5e6dcd4667aa88665a1a681fb8620b2c4.zip | |
mesa pixman xkeyboard-config git update 1 Jun 2011
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_cb_blit.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_blit.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_blit.c b/mesalib/src/mesa/state_tracker/st_cb_blit.c index 25c95c7b9..416be194d 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_blit.c +++ b/mesalib/src/mesa/state_tracker/st_cb_blit.c @@ -109,6 +109,11 @@ st_BlitFramebuffer(struct gl_context *ctx, dstY1 = tmp; } + /* Disable conditional rendering. */ + if (st->render_condition) { + st->pipe->render_condition(st->pipe, NULL, 0); + } + if (mask & GL_COLOR_BUFFER_BIT) { struct gl_renderbuffer_attachment *srcAtt = &readFB->Attachment[readFB->_ColorReadBufferIndex]; @@ -121,7 +126,7 @@ st_BlitFramebuffer(struct gl_context *ctx, struct pipe_surface *dstSurf = dstRb->surface; if (!srcObj->pt) - return; + goto done; util_blit_pixels(st->blit, srcObj->pt, srcAtt->TextureLevel, srcX0, srcY0, srcX1, srcY1, @@ -199,6 +204,13 @@ st_BlitFramebuffer(struct gl_context *ctx, } } } + +done: + /* Restore conditional rendering state. */ + if (st->render_condition) { + st->pipe->render_condition(st->pipe, st->render_condition, + st->condition_mode); + } } |