r600g: disable handling of DISCARD_RANGE

[mesa.git] / src / gallium / drivers / r600 / r600_hw_context_priv.h

diff --git a/src/gallium/drivers/r600/r600_hw_context_priv.h b/src/gallium/drivers/r600/r600_hw_context_priv.h
index c32fc6386ebad8012574d95cc75f412b3d44cf3d..8d0ebc9d52db82b8c80d327e48f072a8066a3978 100644 (file)
--- a/src/gallium/drivers/r600/r600_hw_context_priv.h
+++ b/src/gallium/drivers/r600/r600_hw_context_priv.h
@@ -27,13 +27,8 @@
 #define R600_PRIV_H
 
 #include "r600_pipe.h"
-#include "util/u_hash_table.h"
-#include "os/os_thread.h"
 
-#define R600_MAX_DRAW_CS_DWORDS 11
-
-#define PKT_COUNT_C                     0xC000FFFF
-#define PKT_COUNT_S(x)                  (((x) & 0x3FFF) << 16)
+#define R600_MAX_DRAW_CS_DWORDS 16
 
 /* these flags are used in register flags and added into block flags */
 #define REG_FLAG_NEED_BO 1
@@ -41,7 +36,6 @@
 #define REG_FLAG_RV6XX_SBU 4
 #define REG_FLAG_NOT_R600 8
 #define REG_FLAG_ENABLE_ALWAYS 16
-#define BLOCK_FLAG_RESOURCE 32
 #define REG_FLAG_FLUSH_CHANGE 64
 
 #define GROUP_FORCE_NEW_BLOCK  0
@@ -55,14 +49,14 @@ struct r600_reg {
 /*
  * r600_hw_context.c
  */
-struct r600_resource *r600_context_reg_bo(struct r600_context *ctx, unsigned offset);
 int r600_context_add_block(struct r600_context *ctx, const struct r600_reg *reg, unsigned nreg,
                           unsigned opcode, unsigned offset_base);
-void r600_context_pipe_state_set_resource(struct r600_context *ctx, struct r600_pipe_resource_state *state, struct r600_block *block);
 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);
-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);
+int r600_state_sampler_init(struct r600_context *ctx, uint32_t offset);
+void r600_context_pipe_state_set_sampler(struct r600_context *ctx, struct r600_pipe_state *state, unsigned offset);
+void r600_context_ps_partial_flush(struct r600_context *ctx);
 
 /*
  * evergreen_hw_context.c
@@ -70,12 +64,4 @@ int r600_resource_init(struct r600_context *ctx, struct r600_range *range, unsig
 void evergreen_flush_vgt_streamout(struct r600_context *ctx);
 void evergreen_set_streamout_enable(struct r600_context *ctx, unsigned buffer_enable_bit);
 
-
-static INLINE unsigned r600_context_bo_reloc(struct r600_context *ctx, struct r600_resource *rbo,
-                                            enum radeon_bo_usage usage)
-{
-       assert(usage);
-       return ctx->ws->cs_add_reloc(ctx->cs, rbo->cs_buf, usage, rbo->domains) * 4;
-}
-
 #endif