Mesa (master): Revert "freedreno/a4xx: better occlusion/sample counting"

[Rob Clark]

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

Author: Rob Clark <robclark at freedesktop.org>
Date:   Tue Apr 12 16:06:17 2016 -0400

Revert "freedreno/a4xx: better occlusion/sample counting"

This reverts commit 62fa868728c729152af0d7cecd1d3e47e831cb7d.

dEQP-GLES3.functional.occlusion_query.* was unhappy about that change.
Still not really sure *what* the other slots in the sample results
buffer are.

Signed-off-by: Rob Clark <robclark at freedesktop.org>

---

 src/gallium/drivers/freedreno/a4xx/fd4_query.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_query.c b/src/gallium/drivers/freedreno/a4xx/fd4_query.c
index 77e203f..69decbc 100644
--- a/src/gallium/drivers/freedreno/a4xx/fd4_query.c
+++ b/src/gallium/drivers/freedreno/a4xx/fd4_query.c
@@ -82,12 +82,7 @@ static uint64_t
 count_samples(const struct fd_rb_samp_ctrs *start,
 		const struct fd_rb_samp_ctrs *end)
 {
-	uint64_t n = 0;
-
-	for (unsigned i = 0; i < 16; i += 4)
-		n += end->ctr[i] - start->ctr[i];
-
-	return n / 2;
+	return end->ctr[0] - start->ctr[0];
 }
 
 static void