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_drawpixels.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_drawpixels.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_drawpixels.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c index 29c1df4ae..965fbcd1d 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c @@ -1247,7 +1247,8 @@ blit_copy_pixels(struct gl_context *ctx, GLint srcx, GLint srcy, !ctx->VertexProgram.Enabled && !ctx->Shader.CurrentFragmentProgram && st_fb_orientation(ctx->ReadBuffer) == st_fb_orientation(ctx->DrawBuffer) && - ctx->DrawBuffer->_NumColorDrawBuffers == 1) { + ctx->DrawBuffer->_NumColorDrawBuffers == 1 && + !ctx->Query.CondRenderQuery) { struct st_renderbuffer *rbRead, *rbDraw; GLint drawX, drawY; |