Mesa (master): st/mesa: don' t use blit_copy_pixels if an occlusion query is active

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 9ef44e6eb791192894cbaa6fd302b2d4fc9c2571
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9ef44e6eb791192894cbaa6fd302b2d4fc9c2571

Author: Marek Olšák <maraeo at gmail.com>
Date:   Fri May 31 15:13:46 2013 +0200

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 <brianp at vmware.com>

---

 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 16ff307..eb75500 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;
 
       /*