r600g: fix occlusion query after change to block structure
authorJerome Glisse <jglisse@redhat.com>
Mon, 27 Sep 2010 21:00:07 +0000 (17:00 -0400)
committerJerome Glisse <jglisse@redhat.com>
Mon, 27 Sep 2010 21:00:07 +0000 (17:00 -0400)
block->reg point to register value not block->pm4 which point
to packet.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
src/gallium/winsys/r600/drm/r600_priv.h

index 25a65c6a10f3bab2ce5376b751c10ad911ce6af7..189644f31cd7bd95adde7141797d5c8ad326d15d 100644 (file)
@@ -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;