diff options
| author | Marek Olšák <[email protected]> | 2012-01-29 17:18:09 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-01-31 02:18:32 +0100 |
| commit | bed20f02a771f43e1c5092254705701c228cfa7f (patch) | |
| tree | 0a9409544a7befdd0e73a56b6e3d01360cd1b206 | |
| parent | 85db52025189c88437f82369716ffe88429dc08b (diff) | |
r600g: get rid of r600_context_reg
Reviewed-by: Dave Airlie <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>
| -rw-r--r-- | src/gallium/drivers/r600/r600_hw_context.c | 27 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_hw_context_priv.h | 3 |
2 files changed, 0 insertions, 30 deletions
diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c index 5026b800e9a..0d5fcb42d54 100644 --- a/src/gallium/drivers/r600/r600_hw_context.c +++ b/src/gallium/drivers/r600/r600_hw_context.c @@ -1025,33 +1025,6 @@ void r600_context_bo_flush(struct r600_context *ctx, unsigned flush_flags, bo->cs_buf->last_flush = (bo->cs_buf->last_flush | flush_flags) & flush_mask; } -void r600_context_reg(struct r600_context *ctx, - unsigned offset, unsigned value, - unsigned mask) -{ - struct r600_range *range; - struct r600_block *block; - unsigned id; - unsigned new_val; - int dirty; - - range = &ctx->range[CTX_RANGE_ID(offset)]; - block = range->blocks[CTX_BLOCK_ID(offset)]; - id = (offset - block->start_offset) >> 2; - - dirty = block->status & R600_BLOCK_STATUS_DIRTY; - - new_val = block->reg[id]; - new_val &= ~mask; - new_val |= value; - if (new_val != block->reg[id]) { - dirty |= R600_BLOCK_STATUS_DIRTY; - block->reg[id] = new_val; - } - if (dirty) - r600_context_dirty_block(ctx, block, dirty, id); -} - void r600_context_dirty_block(struct r600_context *ctx, struct r600_block *block, int dirty, int index) diff --git a/src/gallium/drivers/r600/r600_hw_context_priv.h b/src/gallium/drivers/r600/r600_hw_context_priv.h index c7d5b6ad9d8..e2ede0fffd4 100644 --- a/src/gallium/drivers/r600/r600_hw_context_priv.h +++ b/src/gallium/drivers/r600/r600_hw_context_priv.h @@ -70,9 +70,6 @@ void r600_context_block_resource_emit_dirty(struct r600_context *ctx, struct r60 void r600_context_dirty_block(struct r600_context *ctx, struct r600_block *block, int dirty, int index); int r600_setup_block_table(struct r600_context *ctx); -void r600_context_reg(struct r600_context *ctx, - unsigned offset, unsigned value, - unsigned mask); void r600_init_cs(struct r600_context *ctx); int r600_resource_init(struct r600_context *ctx, struct r600_range *range, unsigned offset, unsigned nblocks, unsigned stride, struct r600_reg *reg, int nreg, unsigned offset_base); |