From 0671400dcc72553b5f9719639e86069a1734dbe5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 30 Jan 2012 08:54:01 +0100 Subject: [PATCH] r600g: remove more dead code --- src/gallium/drivers/r600/r600.h | 2 -- src/gallium/drivers/r600/r600_hw_context.c | 7 ------- 2 files changed, 9 deletions(-) diff --git a/src/gallium/drivers/r600/r600.h b/src/gallium/drivers/r600/r600.h index b5d2a89c314..d0f0b399b41 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 1569562f7d0..ba15ac8afec 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) && -- 2.30.2