r600g: remove unused definitions

diff --git a/src/gallium/drivers/r600/r600.h b/src/gallium/drivers/r600/r600.h
index 48e13fb9766e4d1db135b23c73cf30a9ec287a0a..e0d81d854de59d376fe0a0d15a281d0d955f9bd9 100644 (file)
--- a/src/gallium/drivers/r600/r600.h
+++ b/src/gallium/drivers/r600/r600.h
@@ -88,8 +88,6 @@ struct r600_resource {
        unsigned                        domains;
 };
 
-/* R600/R700 STATES */
-#define R600_GROUP_MAX                 16
 #define R600_BLOCK_MAX_BO              32
 #define R600_BLOCK_MAX_REG             128
 
@@ -199,7 +197,6 @@ struct r600_so_target {
 
 #define R600_CONTEXT_DRAW_PENDING      (1 << 0)
 #define R600_CONTEXT_DST_CACHES_DIRTY  (1 << 1)
-#define R600_CONTEXT_CHECK_EVENT_FLUSH (1 << 2)
 
 struct r600_context;
 struct r600_screen;

diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c
index 5fb2465dc52582bbf56f816b6481c84fa31e92a0..094b8fe2c3784f7f3b4e95e4c12a3c8620cc67bd 100644 (file)
--- a/src/gallium/drivers/r600/r600_hw_context.c
+++ b/src/gallium/drivers/r600/r600_hw_context.c
@@ -1094,8 +1094,6 @@ void r600_context_block_emit_dirty(struct r600_context *ctx, struct r600_block *
        }
 
        if (nbo) {
-               ctx->flags |= R600_CONTEXT_CHECK_EVENT_FLUSH;
-
                for (int j = 0; j < block->nreg; j++) {
                        if (block->pm4_bo_index[j]) {
                                /* find relocation */
@@ -1112,7 +1110,6 @@ void r600_context_block_emit_dirty(struct r600_context *ctx, struct r600_block *
 
                        }
                }
-               ctx->flags &= ~R600_CONTEXT_CHECK_EVENT_FLUSH;
        }
 
        optional &= (block->nreg_dirty != block->nreg);
@@ -1144,8 +1141,6 @@ void r600_context_block_resource_emit_dirty(struct r600_context *ctx, struct r60
        int cp_dwords = block->pm4_ndwords;
        int nbo = block->nbo;
 
-       ctx->flags |= R600_CONTEXT_CHECK_EVENT_FLUSH;
-
        if (block->status & R600_BLOCK_STATUS_RESOURCE_VERTEX) {
                nbo = 1;
                cp_dwords -= 2; /* don't copy the second NOP */
@@ -1159,7 +1154,6 @@ void r600_context_block_resource_emit_dirty(struct r600_context *ctx, struct r60
                                r600_context_bo_reloc(ctx, reloc->bo, reloc->bo_usage);
                }
        }
-       ctx->flags &= ~R600_CONTEXT_CHECK_EVENT_FLUSH;
 
        memcpy(&cs->buf[cs->cdw], block->pm4, cp_dwords * 4);
        cs->cdw += cp_dwords;

diff --git a/src/gallium/drivers/r600/r600_hw_context_priv.h b/src/gallium/drivers/r600/r600_hw_context_priv.h
index ac5b4cb7ce4e5457a668e1b0e02babc520209b7b..e9d8984e7dcff8a97694329f3c0f9bd6f92ebd96 100644 (file)
--- a/src/gallium/drivers/r600/r600_hw_context_priv.h
+++ b/src/gallium/drivers/r600/r600_hw_context_priv.h
@@ -32,9 +32,6 @@
 
 #define R600_MAX_DRAW_CS_DWORDS 11
 
-#define PKT_COUNT_C                     0xC000FFFF
-#define PKT_COUNT_S(x)                  (((x) & 0x3FFF) << 16)
-
 /* these flags are used in register flags and added into block flags */
 #define REG_FLAG_NEED_BO 1
 #define REG_FLAG_DIRTY_ALWAYS 2