r600: fork and import gallium/radeon

This marks the end of code sharing between r600 and radeonsi.
It's getting difficult to work on radeonsi without breaking r600.

A lot of functions had to be renamed to prevent linker conflicts.
There are also minor cleanups.

Acked-by: Dave Airlie <[email protected]>
Reviewed-by: Nicolai Hähnle <[email protected]>

1 files changed, 30 insertions, 30 deletions

diff --git a/src/gallium/drivers/radeon/r600_query.h b/src/gallium/drivers/radeon/r600_query.h
index 7455c8e63a8..a20da075c68 100644
--- a/src/gallium/drivers/radeon/r600_query.h
+++ b/src/gallium/drivers/radeon/r600_query.h
@@ -200,18 +200,18 @@ struct r600_query_hw {
 	unsigned workaround_offset;
 };
 
-bool r600_query_hw_init(struct r600_common_screen *rscreen,
-			struct r600_query_hw *query);
-void r600_query_hw_destroy(struct r600_common_screen *rscreen,
-			   struct r600_query *rquery);
-bool r600_query_hw_begin(struct r600_common_context *rctx,
+bool si_query_hw_init(struct r600_common_screen *rscreen,
+		      struct r600_query_hw *query);
+void si_query_hw_destroy(struct r600_common_screen *rscreen,
 			 struct r600_query *rquery);
-bool r600_query_hw_end(struct r600_common_context *rctx,
+bool si_query_hw_begin(struct r600_common_context *rctx,
 		       struct r600_query *rquery);
-bool r600_query_hw_get_result(struct r600_common_context *rctx,
-			      struct r600_query *rquery,
-			      bool wait,
-			      union pipe_query_result *result);
+bool si_query_hw_end(struct r600_common_context *rctx,
+		     struct r600_query *rquery);
+bool si_query_hw_get_result(struct r600_common_context *rctx,
+			    struct r600_query *rquery,
+			    bool wait,
+			    union pipe_query_result *result);
 
 /* Performance counters */
 enum {
@@ -297,26 +297,26 @@ struct r600_perfcounters {
 	bool separate_instance;
 };
 
-struct pipe_query *r600_create_batch_query(struct pipe_context *ctx,
-					   unsigned num_queries,
-					   unsigned *query_types);
-
-int r600_get_perfcounter_info(struct r600_common_screen *,
-			      unsigned index,
-			      struct pipe_driver_query_info *info);
-int r600_get_perfcounter_group_info(struct r600_common_screen *,
-				    unsigned index,
-				    struct pipe_driver_query_group_info *info);
-
-bool r600_perfcounters_init(struct r600_perfcounters *, unsigned num_blocks);
-void r600_perfcounters_add_block(struct r600_common_screen *,
-				 struct r600_perfcounters *,
-				 const char *name, unsigned flags,
-				 unsigned counters, unsigned selectors,
-				 unsigned instances, void *data);
-void r600_perfcounters_do_destroy(struct r600_perfcounters *);
-void r600_query_hw_reset_buffers(struct r600_common_context *rctx,
-				 struct r600_query_hw *query);
+struct pipe_query *si_create_batch_query(struct pipe_context *ctx,
+					 unsigned num_queries,
+					 unsigned *query_types);
+
+int si_get_perfcounter_info(struct r600_common_screen *,
+			    unsigned index,
+			    struct pipe_driver_query_info *info);
+int si_get_perfcounter_group_info(struct r600_common_screen *,
+				  unsigned index,
+				  struct pipe_driver_query_group_info *info);
+
+bool si_perfcounters_init(struct r600_perfcounters *, unsigned num_blocks);
+void si_perfcounters_add_block(struct r600_common_screen *,
+			       struct r600_perfcounters *,
+			       const char *name, unsigned flags,
+			       unsigned counters, unsigned selectors,
+			       unsigned instances, void *data);
+void si_perfcounters_do_destroy(struct r600_perfcounters *);
+void si_query_hw_reset_buffers(struct r600_common_context *rctx,
+			       struct r600_query_hw *query);
 
 struct r600_qbo_state {
 	void *saved_compute;