radeonsi: Rename the commonly occurring rctx/r600 variables.

The "r" stands for R600.

Reviewed-by: Marek Olšák <[email protected]>

1 files changed, 21 insertions, 21 deletions

diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h
index 0a211112e02..3fe3cb80538 100644
--- a/src/gallium/drivers/radeonsi/si_state.h
+++ b/src/gallium/drivers/radeonsi/si_state.h
@@ -162,41 +162,41 @@ struct si_buffer_resources {
 #define si_pm4_block_idx(member) \
 	(offsetof(union si_state, named.member) / sizeof(struct si_pm4_state *))
 
-#define si_pm4_state_changed(rctx, member) \
-	((rctx)->queued.named.member != (rctx)->emitted.named.member)
+#define si_pm4_state_changed(sctx, member) \
+	((sctx)->queued.named.member != (sctx)->emitted.named.member)
 
-#define si_pm4_bind_state(rctx, member, value) \
+#define si_pm4_bind_state(sctx, member, value) \
 	do { \
-		(rctx)->queued.named.member = (value); \
+		(sctx)->queued.named.member = (value); \
 	} while(0)
 
-#define si_pm4_delete_state(rctx, member, value) \
+#define si_pm4_delete_state(sctx, member, value) \
 	do { \
-		if ((rctx)->queued.named.member == (value)) { \
-			(rctx)->queued.named.member = NULL; \
+		if ((sctx)->queued.named.member == (value)) { \
+			(sctx)->queued.named.member = NULL; \
 		} \
-		si_pm4_free_state(rctx, (struct si_pm4_state *)(value), \
+		si_pm4_free_state(sctx, (struct si_pm4_state *)(value), \
 				  si_pm4_block_idx(member)); \
 	} while(0)
 
-#define si_pm4_set_state(rctx, member, value) \
+#define si_pm4_set_state(sctx, member, value) \
 	do { \
-		if ((rctx)->queued.named.member != (value)) { \
-			si_pm4_free_state(rctx, \
-				(struct si_pm4_state *)(rctx)->queued.named.member, \
+		if ((sctx)->queued.named.member != (value)) { \
+			si_pm4_free_state(sctx, \
+				(struct si_pm4_state *)(sctx)->queued.named.member, \
 				si_pm4_block_idx(member)); \
-			(rctx)->queued.named.member = (value); \
+			(sctx)->queued.named.member = (value); \
 		} \
 	} while(0)
 
 /* si_descriptors.c */
-void si_set_sampler_view(struct si_context *rctx, unsigned shader,
+void si_set_sampler_view(struct si_context *sctx, unsigned shader,
 			 unsigned slot, struct pipe_sampler_view *view,
 			 unsigned *view_desc);
-void si_init_all_descriptors(struct si_context *rctx);
-void si_release_all_descriptors(struct si_context *rctx);
-void si_all_descriptors_begin_new_cs(struct si_context *rctx);
-void si_copy_buffer(struct si_context *rctx,
+void si_init_all_descriptors(struct si_context *sctx);
+void si_release_all_descriptors(struct si_context *sctx);
+void si_all_descriptors_begin_new_cs(struct si_context *sctx);
+void si_copy_buffer(struct si_context *sctx,
 		    struct pipe_resource *dst, struct pipe_resource *src,
 		    uint64_t dst_offset, uint64_t src_offset, unsigned size);
 
@@ -212,12 +212,12 @@ boolean si_is_format_supported(struct pipe_screen *screen,
 int si_shader_select(struct pipe_context *ctx,
 		     struct si_pipe_shader_selector *sel,
 		     unsigned *dirty);
-void si_init_state_functions(struct si_context *rctx);
-void si_init_config(struct si_context *rctx);
+void si_init_state_functions(struct si_context *sctx);
+void si_init_config(struct si_context *sctx);
 
 /* si_state_draw.c */
 extern const struct r600_atom si_atom_cache_flush;
-void si_emit_cache_flush(struct r600_common_context *rctx, struct r600_atom *atom);
+void si_emit_cache_flush(struct r600_common_context *sctx, struct r600_atom *atom);
 void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *dinfo);
 
 /* si_commands.c */