r600g: remove more dead code

diff --git a/src/gallium/drivers/r600/r600.h b/src/gallium/drivers/r600/r600.h
index b5d2a89c314bf4de33e576692d8a6b04e1f9160f..d0f0b399b414a5bafb42e5de21ec93f17fcb96e9 100644 (file)
--- 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 1569562f7d0643acfdbd1a518e295d6bce7def9a..ba15ac8afec5d0bbdf0674ad213825ca6f38dbc4 100644 (file)
--- 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) &&