r600g: disable handling of DISCARD_RANGE

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

diff --git a/src/gallium/drivers/r600/r600.h b/src/gallium/drivers/r600/r600.h
index e0d81d854de59d376fe0a0d15a281d0d955f9bd9..1c8bd243256ec0c234f087f3f9776ad1a80ff49b 100644 (file)
--- a/src/gallium/drivers/r600/r600.h
+++ b/src/gallium/drivers/r600/r600.h
@@ -28,7 +28,7 @@
 
 #include "../../winsys/radeon/drm/radeon_winsys.h"
 #include "util/u_double_list.h"
-#include "util/u_vbuf.h"
+#include "util/u_transfer.h"
 
 #define R600_ERR(fmt, args...) \
        fprintf(stderr, "EE %s:%d %s - "fmt, __FILE__, __LINE__, __func__, ##args)
@@ -61,6 +61,7 @@ enum radeon_family {
        CHIP_TURKS,
        CHIP_CAICOS,
        CHIP_CAYMAN,
+       CHIP_ARUBA,
        CHIP_LAST,
 };
 
@@ -78,7 +79,7 @@ struct r600_tiling_info {
 };
 
 struct r600_resource {
-       struct u_vbuf_resource          b;
+       struct u_resource               b;
 
        /* Winsys objects. */
        struct pb_buffer                *buf;
@@ -116,18 +117,8 @@ struct r600_pipe_state {
        struct r600_pipe_reg            regs[R600_BLOCK_MAX_REG];
 };
 
-struct r600_pipe_resource_state {
-       unsigned                        id;
-       uint32_t                        val[8];
-       struct r600_resource            *bo[2];
-       enum radeon_bo_usage            bo_usage[2];
-};
-
 #define R600_BLOCK_STATUS_ENABLED      (1 << 0)
 #define R600_BLOCK_STATUS_DIRTY                (1 << 1)
-#define R600_BLOCK_STATUS_RESOURCE_DIRTY       (1 << 2)
-
-#define R600_BLOCK_STATUS_RESOURCE_VERTEX      (1 << 3)
 
 struct r600_block_reloc {
        struct r600_resource    *bo;
@@ -166,12 +157,6 @@ struct r600_query_buffer {
        struct r600_query_buffer                *previous;
 };
 
-union r600_query_result {
-       uint64_t                        u64;
-       boolean                         b;
-       struct pipe_query_data_so_statistics so;
-};
-
 struct r600_query {
        /* The query buffer and how many results are in it. */
        struct r600_query_buffer                buffer;
@@ -197,6 +182,7 @@ struct r600_so_target {
 
 #define R600_CONTEXT_DRAW_PENDING      (1 << 0)
 #define R600_CONTEXT_DST_CACHES_DIRTY  (1 << 1)
+#define R600_PARTIAL_FLUSH             (1 << 2)
 
 struct r600_context;
 struct r600_screen;
@@ -204,12 +190,8 @@ struct r600_screen;
 void r600_get_backend_mask(struct r600_context *ctx);
 int r600_context_init(struct r600_context *ctx);
 void r600_context_fini(struct r600_context *ctx);
+void r600_context_pipe_state_emit(struct r600_context *ctx, struct r600_pipe_state *state, unsigned pkt_flags);
 void r600_context_pipe_state_set(struct r600_context *ctx, struct r600_pipe_state *state);
-void r600_context_pipe_state_set_ps_resource(struct r600_context *ctx, struct r600_pipe_resource_state *state, unsigned rid);
-void r600_context_pipe_state_set_vs_resource(struct r600_context *ctx, struct r600_pipe_resource_state *state, unsigned rid);
-void r600_context_pipe_state_set_fs_resource(struct r600_context *ctx, struct r600_pipe_resource_state *state, unsigned rid);
-void r600_context_pipe_state_set_ps_sampler(struct r600_context *ctx, struct r600_pipe_state *state, unsigned id);
-void r600_context_pipe_state_set_vs_sampler(struct r600_context *ctx, struct r600_pipe_state *state, unsigned id);
 void r600_context_flush(struct r600_context *ctx, unsigned flags);
 
 void r600_context_emit_fence(struct r600_context *ctx, struct r600_resource *fence,
@@ -221,28 +203,30 @@ void r600_flush_framebuffer(struct r600_context *ctx, bool flush_now);
 
 void r600_context_streamout_begin(struct r600_context *ctx);
 void r600_context_streamout_end(struct r600_context *ctx);
-void r600_context_draw_opaque_count(struct r600_context *ctx, struct r600_so_target *t);
 void r600_need_cs_space(struct r600_context *ctx, unsigned num_dw, boolean count_draw_in);
-void r600_context_block_emit_dirty(struct r600_context *ctx, struct r600_block *block);
-void r600_context_block_resource_emit_dirty(struct r600_context *ctx, struct r600_block *block);
+void r600_context_block_emit_dirty(struct r600_context *ctx, struct r600_block *block, unsigned pkt_flags);
 
 int evergreen_context_init(struct r600_context *ctx);
-void evergreen_context_pipe_state_set_ps_sampler(struct r600_context *ctx, struct r600_pipe_state *state, unsigned id);
-void evergreen_context_pipe_state_set_vs_sampler(struct r600_context *ctx, struct r600_pipe_state *state, unsigned id);
+
+void _r600_pipe_state_add_reg_bo(struct r600_context *ctx,
+                                struct r600_pipe_state *state,
+                                uint32_t offset, uint32_t value,
+                                uint32_t range_id, uint32_t block_id,
+                                struct r600_resource *bo,
+                                enum radeon_bo_usage usage);
 
 void _r600_pipe_state_add_reg(struct r600_context *ctx,
                              struct r600_pipe_state *state,
                              uint32_t offset, uint32_t value,
-                             uint32_t range_id, uint32_t block_id,
-                             struct r600_resource *bo,
-                             enum radeon_bo_usage usage);
+                             uint32_t range_id, uint32_t block_id);
 
 void r600_pipe_state_add_reg_noblock(struct r600_pipe_state *state,
                                     uint32_t offset, uint32_t value,
                                     struct r600_resource *bo,
                                     enum radeon_bo_usage usage);
 
-#define r600_pipe_state_add_reg(state, offset, value, bo, usage) _r600_pipe_state_add_reg(rctx, state, offset, value, CTX_RANGE_ID(offset), CTX_BLOCK_ID(offset), bo, usage)
+#define r600_pipe_state_add_reg_bo(state, offset, value, bo, usage) _r600_pipe_state_add_reg_bo(rctx, state, offset, value, CTX_RANGE_ID(offset), CTX_BLOCK_ID(offset), bo, usage)
+#define r600_pipe_state_add_reg(state, offset, value) _r600_pipe_state_add_reg(rctx, state, offset, value, CTX_RANGE_ID(offset), CTX_BLOCK_ID(offset))
 
 static inline void r600_pipe_state_mod_reg(struct r600_pipe_state *state,
                                           uint32_t value)
@@ -251,14 +235,4 @@ static inline void r600_pipe_state_mod_reg(struct r600_pipe_state *state,
        state->nregs++;
 }
 
-static inline void r600_pipe_state_mod_reg_bo(struct r600_pipe_state *state,
-                                             uint32_t value, struct r600_resource *bo,
-                                             enum radeon_bo_usage usage)
-{
-       state->regs[state->nregs].value = value;
-       state->regs[state->nregs].bo = bo;
-       state->regs[state->nregs].bo_usage = usage;
-       state->nregs++;
-}
-
 #endif