Merge remote-tracking branch 'origin/master' into pipe-video

[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 a617a5b8631b5e6fbba449d0b5d3f1ce62a2da3d..33aa45088a8f814a3cbd3fa76f6543897b353691 100644 (file)
--- a/src/gallium/drivers/r600/r600.h
+++ b/src/gallium/drivers/r600/r600.h
@@ -35,7 +35,7 @@
 #define RADEON_CTX_MAX_PM4     (64 * 1024 / 4)
 
 #define R600_ERR(fmt, args...) \
-       fprintf(stderr, "EE %s/%s:%d - "fmt, __FILE__, __func__, __LINE__, ##args)
+       fprintf(stderr, "EE %s:%d %s - "fmt, __FILE__, __LINE__, __func__, ##args)
 
 typedef uint64_t               u64;
 typedef uint32_t               u32;
@@ -91,6 +91,10 @@ enum radeon_family {
        CHIP_JUNIPER,
        CHIP_CYPRESS,
        CHIP_HEMLOCK,
+       CHIP_PALM,
+       CHIP_BARTS,
+       CHIP_TURKS,
+       CHIP_CAICOS,
        CHIP_LAST,
 };
 
@@ -109,14 +113,17 @@ struct r600_tiling_info {
 enum radeon_family r600_get_family(struct radeon *rw);
 enum chip_class r600_get_family_class(struct radeon *radeon);
 struct r600_tiling_info *r600_get_tiling_info(struct radeon *radeon);
+unsigned r600_get_clock_crystal_freq(struct radeon *radeon);
+unsigned r600_get_minor_version(struct radeon *radeon);
+unsigned r600_get_num_backends(struct radeon *radeon);
 
 /* r600_bo.c */
 struct r600_bo;
 struct r600_bo *r600_bo(struct radeon *radeon,
-                        unsigned size, unsigned alignment,
-                        unsigned binding, unsigned usage);
+                       unsigned size, unsigned alignment,
+                       unsigned binding, unsigned usage);
 struct r600_bo *r600_bo_handle(struct radeon *radeon,
-                              unsigned handle, unsigned *array_mode);
+                               unsigned handle, unsigned *array_mode);
 void *r600_bo_map(struct radeon *radeon, struct r600_bo *bo, unsigned usage, void *ctx);
 void r600_bo_unmap(struct radeon *radeon, struct r600_bo *bo);
 void r600_bo_reference(struct radeon *radeon, struct r600_bo **dst,
@@ -172,11 +179,13 @@ struct r600_block_reloc {
 struct r600_block {
        struct list_head        list;
        unsigned                status;
+       unsigned                flags;
        unsigned                start_offset;
        unsigned                pm4_ndwords;
        unsigned                pm4_flush_ndwords;
        unsigned                nbo;
-       unsigned                nreg;
+       u16                     nreg;
+       u16                     nreg_dirty;
        u32                     *reg;
        u32                     pm4[R600_BLOCK_MAX_REG];
        unsigned                pm4_bo_index[R600_BLOCK_MAX_REG];
@@ -224,6 +233,9 @@ struct r600_query {
 #define R600_QUERY_STATE_ENDED         (1 << 1)
 #define R600_QUERY_STATE_SUSPENDED     (1 << 2)
 
+#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 radeon           *radeon;
@@ -244,10 +256,11 @@ struct r600_context {
        u32                     *pm4;
        struct list_head        query_list;
        unsigned                num_query_running;
-       unsigned                fence;
        struct list_head        fenced_bo;
-       unsigned                *cfence;
-       struct r600_bo          *fence_bo;
+       unsigned                max_db; /* for OQ */
+       unsigned                num_dest_buffers;
+       unsigned                flags;
+       boolean                 predicate_drawing;
 };
 
 struct r600_draw {
@@ -280,17 +293,22 @@ void r600_query_begin(struct r600_context *ctx, struct r600_query *query);
 void r600_query_end(struct r600_context *ctx, struct r600_query *query);
 void r600_context_queries_suspend(struct r600_context *ctx);
 void r600_context_queries_resume(struct r600_context *ctx);
+void r600_query_predication(struct r600_context *ctx, struct r600_query *query, int operation,
+                           int flag_wait);
+void r600_context_emit_fence(struct r600_context *ctx, struct r600_bo *fence,
+                             unsigned offset, unsigned value);
+void r600_context_flush_all(struct r600_context *ctx, unsigned flush_flags);
+void r600_context_flush_dest_caches(struct r600_context *ctx);
 
 int evergreen_context_init(struct r600_context *ctx, struct radeon *radeon);
 void evergreen_context_draw(struct r600_context *ctx, const struct r600_draw *draw);
-void evergreen_ps_resource_set(struct r600_context *ctx, struct r600_pipe_state *state, unsigned rid);
-void evergreen_vs_resource_set(struct r600_context *ctx, struct r600_pipe_state *state, unsigned rid);
-void evergreen_fs_resource_set(struct r600_context *ctx, struct r600_pipe_state *state, unsigned rid);
-
+void evergreen_context_flush_dest_caches(struct r600_context *ctx);
 void evergreen_context_pipe_state_set_ps_resource(struct r600_context *ctx, struct r600_pipe_state *state, unsigned rid);
 void evergreen_context_pipe_state_set_vs_resource(struct r600_context *ctx, struct r600_pipe_state *state, unsigned rid);
 void evergreen_context_pipe_state_set_fs_resource(struct r600_context *ctx, struct r600_pipe_state *state, unsigned rid);
 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);
 
+struct radeon *radeon_decref(struct radeon *radeon);
+
 #endif