Mesa (master): r600g: fix occlusion query after change to block structure

[Jerome Glisse]

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

Author: Jerome Glisse <jglisse at redhat.com>
Date:   Mon Sep 27 17:00:07 2010 -0400

r600g: fix occlusion query after change to block structure

block->reg point to register value not block->pm4 which point
to packet.

Signed-off-by: Jerome Glisse <jglisse at redhat.com>

---

 src/gallium/winsys/r600/drm/r600_priv.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/winsys/r600/drm/r600_priv.h b/src/gallium/winsys/r600/drm/r600_priv.h
index 25a65c6..189644f 100644
--- a/src/gallium/winsys/r600/drm/r600_priv.h
+++ b/src/gallium/winsys/r600/drm/r600_priv.h
@@ -66,10 +66,10 @@ static void inline r600_context_reg(struct r600_context *ctx, unsigned group_id,
 	id = group->offset_block_id[(offset - group->start_offset) >> 2];
 	block = &group->blocks[id];
 	id = (offset - block->start_offset) >> 2;
-	block->pm4[id] &= ~mask;
-	block->pm4[id] |= value;
+	block->reg[id] &= ~mask;
+	block->reg[id] |= value;
 	if (!(block->status & R600_BLOCK_STATUS_DIRTY)) {
-		ctx->pm4_dirty_cdwords += 2 + block->pm4_ndwords;
+		ctx->pm4_dirty_cdwords += block->pm4_ndwords;
 	}
 	block->status |= R600_BLOCK_STATUS_ENABLED;
 	block->status |= R600_BLOCK_STATUS_DIRTY;