[Mesa-dev] [PATCH 11/15] r600g: remove more dead code

Marek Olšák maraeo at gmail.com
Mon Jan 30 12:23:14 PST 2012


---
 src/gallium/drivers/r600/r600.h            |    2 --
 src/gallium/drivers/r600/r600_hw_context.c |    7 -------
 2 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/src/gallium/drivers/r600/r600.h b/src/gallium/drivers/r600/r600.h
index b5d2a89..d0f0b39 100644
--- a/src/gallium/drivers/r600/r600.h
+++ b/src/gallium/drivers/r600/r600.h
@@ -134,8 +134,6 @@ struct r600_pipe_resource_state {
 struct r600_block_reloc {
 	struct r600_resource	*bo;
 	enum radeon_bo_usage	bo_usage;
-	unsigned		flush_flags;
-	unsigned		flush_mask;
 	unsigned		bo_pm4_index;
 };
 
diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c
index c2c3f13..ef1f5d5 100644
--- a/src/gallium/drivers/r600/r600_hw_context.c
+++ b/src/gallium/drivers/r600/r600_hw_context.c
@@ -191,13 +191,6 @@ static void r600_init_block(struct r600_context *ctx,
 			block->pm4_bo_index[j] = block->nbo;
 			block->pm4[block->pm4_ndwords++] = PKT3(PKT3_NOP, 0, 0);
 			block->pm4[block->pm4_ndwords++] = 0x00000000;
-			if (reg[i+j].flags & REG_FLAG_RV6XX_SBU) {
-				block->reloc[block->nbo].flush_flags = 0;
-				block->reloc[block->nbo].flush_mask = 0;
-			} else {
-				block->reloc[block->nbo].flush_flags = reg[i+j].flush_flags;
-				block->reloc[block->nbo].flush_mask = reg[i+j].flush_mask;
-			}
 			block->reloc[block->nbo].bo_pm4_index = block->pm4_ndwords - 1;
 		}
 		if ((ctx->screen->family > CHIP_R600) &&
-- 
1.7.5.4



More information about the mesa-dev mailing list