1 files changed, 15 insertions, 15 deletions

diff --git a/src/gallium/drivers/radeonsi/si.h b/src/gallium/drivers/radeonsi/si.h
index d955ae9f7de..466d52e3d5e 100644
--- a/src/gallium/drivers/radeonsi/si.h
+++ b/src/gallium/drivers/radeonsi/si.h
@@ -60,29 +60,29 @@ struct r600_query {
 	struct list_head			list;
 };
 
-struct r600_context;
-struct r600_screen;
+struct si_context;
+struct si_screen;
 
-void si_get_backend_mask(struct r600_context *ctx);
-void si_context_flush(struct r600_context *ctx, unsigned flags);
-void si_begin_new_cs(struct r600_context *ctx);
+void si_get_backend_mask(struct si_context *ctx);
+void si_context_flush(struct si_context *ctx, unsigned flags);
+void si_begin_new_cs(struct si_context *ctx);
 
-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);
-boolean r600_context_query_result(struct r600_context *ctx,
+struct r600_query *r600_context_query_create(struct si_context *ctx, unsigned query_type);
+void r600_context_query_destroy(struct si_context *ctx, struct r600_query *query);
+boolean r600_context_query_result(struct si_context *ctx,
 				struct r600_query *query,
 				boolean wait, void *vresult);
-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,
+void r600_query_begin(struct si_context *ctx, struct r600_query *query);
+void r600_query_end(struct si_context *ctx, struct r600_query *query);
+void r600_context_queries_suspend(struct si_context *ctx);
+void r600_context_queries_resume(struct si_context *ctx);
+void r600_query_predication(struct si_context *ctx, struct r600_query *query, int operation,
 			    int flag_wait);
 
 bool si_is_timer_query(unsigned type);
 bool si_query_needs_begin(unsigned type);
-void si_need_cs_space(struct r600_context *ctx, unsigned num_dw, boolean count_draw_in);
+void si_need_cs_space(struct si_context *ctx, unsigned num_dw, boolean count_draw_in);
 
-int si_context_init(struct r600_context *ctx);
+int si_context_init(struct si_context *ctx);
 
 #endif