From: Marek Olšák <maraeo@gmail.com>
Date: Fri, 31 May 2013 13:13:46 +0000 (+0200)
Subject: st/mesa: don't use blit_copy_pixels if an occlusion query is active
X-Git-Tag: android-x86-4.4-r3~11238
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9ef44e6eb791192894cbaa6fd302b2d4fc9c2571;p=android-x86%2Fexternal-mesa.git

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@vmware.com>
---

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;
 
       /*