diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-30 22:21:12 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-30 22:21:12 +0200 |
| commit | 072157e2ba87f3303958e48815fa2548009d3410 (patch) | |
| tree | 91b7c5446ab4020a6f405f822aeb0800b6a02958 /mesalib/src/mesa/state_tracker/st_cb_drawpixels.c | |
| parent | b53c5364a7161e8310d62b90d5b5ca4635535892 (diff) | |
| download | vcxsrv-072157e2ba87f3303958e48815fa2548009d3410.tar.gz vcxsrv-072157e2ba87f3303958e48815fa2548009d3410.tar.bz2 vcxsrv-072157e2ba87f3303958e48815fa2548009d3410.zip | |
mesa git update 30 May 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; |