From: Eric Anholt <eric@anholt.net>
Date: Mon, 6 May 2013 22:24:12 +0000 (-0700)
Subject: i965: Count occlusion query samples for CopyPixels using the 2D engine.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7a74808d7856e9749895afeb14125c463b2f4fd0;p=mesa.git

i965: Count occlusion query samples for CopyPixels using the 2D engine.

We accidentally "fixed" the piglit test for this when introducing Y
tiling, since this path stopped being executed.  In reenabling this path
for Y tiling, we ended up regressing it again, so just fix it.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59439
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/mesa/drivers/dri/intel/intel_pixel_copy.c b/src/mesa/drivers/dri/intel/intel_pixel_copy.c
index 5d80fed8705..34376ba544e 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel_copy.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_copy.c
@@ -213,6 +213,9 @@ do_blit_copypixels(struct gl_context * ctx,
       return false;
    }
 
+   if (ctx->Query.CurrentOcclusionObject)
+      ctx->Query.CurrentOcclusionObject->Result += width * height;
+
 out:
    intel_check_front_buffer_rendering(intel);