radeonsi: port some of get_shader_param changes from r600g

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

diff --git a/src/gallium/drivers/radeonsi/r600.h b/src/gallium/drivers/radeonsi/r600.h
index f22d920f504f16418027de8c8054272b95d60e7d..8f35cc267640bd8c055bdb079eb474888daf62b0 100644 (file)
--- a/src/gallium/drivers/radeonsi/r600.h
+++ b/src/gallium/drivers/radeonsi/r600.h
@@ -37,20 +37,6 @@
 
 struct winsys_handle;
 
-enum radeon_family {
-       CHIP_UNKNOWN,
-       CHIP_CAYMAN,
-       CHIP_TAHITI,
-       CHIP_PITCAIRN,
-       CHIP_VERDE,
-       CHIP_LAST,
-};
-
-enum chip_class {
-       CAYMAN,
-       TAHITI,
-};
-
 struct r600_tiling_info {
        unsigned num_channels;
        unsigned num_banks;
@@ -92,26 +78,14 @@ struct r600_so_target {
        unsigned                so_index;
 };
 
-#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_draw {
-       uint32_t                vgt_num_indices;
-       uint32_t                vgt_num_instances;
-       uint32_t                vgt_index_type;
-       uint32_t                vgt_draw_initiator;
-       uint32_t                indices_bo_offset;
-       unsigned                db_render_override;
-       unsigned                db_render_control;
-       struct si_resource      *indices;
-};
-
 struct r600_context;
 struct r600_screen;
 
-void r600_get_backend_mask(struct r600_context *ctx);
-void r600_context_flush(struct r600_context *ctx, unsigned flags);
+void si_get_backend_mask(struct r600_context *ctx);
+void si_context_flush(struct r600_context *ctx, unsigned flags);
 
 struct r600_query *r600_context_query_create(struct r600_context *ctx, unsigned query_type);
 void r600_context_query_destroy(struct r600_context *ctx, struct r600_query *query);
@@ -124,15 +98,12 @@ 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 si_resource *fence,
-                             unsigned offset, unsigned value);
+void si_context_emit_fence(struct r600_context *ctx, struct si_resource *fence,
+                           unsigned offset, unsigned value);
 
-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 si_need_cs_space(struct r600_context *ctx, unsigned num_dw, boolean count_draw_in);
 
 int si_context_init(struct r600_context *ctx);
-void si_context_draw(struct r600_context *ctx, const struct r600_draw *draw);
 
 #endif