diff options
author | Marek Olšák <[email protected]> | 2013-05-31 15:13:46 +0200 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2013-06-13 03:54:13 +0200 |
commit | 9ef44e6eb791192894cbaa6fd302b2d4fc9c2571 (patch) | |
tree | 34f51f9e6999a10d89721ca827ea5a6ebab87797 /src/mesa/state_tracker | |
parent | 79e421260a2caf18cd5f11514b3439d9846c743e (diff) |
st/mesa: don't use blit_copy_pixels if an occlusion query is active
CopyPixels, just as DrawPixels, should count the samples that passed
depth test.
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker')
-rw-r--r-- | src/mesa/state_tracker/st_cb_drawpixels.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c index 16ff307f827..eb75500db62 100644 --- a/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/src/mesa/state_tracker/st_cb_drawpixels.c @@ -1365,7 +1365,8 @@ blit_copy_pixels(struct gl_context *ctx, GLint srcx, GLint srcy, !ctx->VertexProgram.Enabled && !ctx->Shader.CurrentFragmentProgram && ctx->DrawBuffer->_NumColorDrawBuffers == 1 && - !ctx->Query.CondRenderQuery) { + !ctx->Query.CondRenderQuery && + !ctx->Query.CurrentOcclusionObject) { struct st_renderbuffer *rbRead, *rbDraw; /* |