[Mesa-dev] [PATCH 7/9] radeonsi: rename rview -> sview

[Marek Olšák]

From: Marek Olšák <marek.olsak at amd.com>

---
 src/gallium/drivers/radeonsi/si_descriptors.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c
index 9900cde51ee..21d4ca946d3 100644
--- a/src/gallium/drivers/radeonsi/si_descriptors.c
+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
@@ -490,32 +490,32 @@ static bool depth_needs_decompression(struct si_texture *tex)
 	 */
 	return tex->db_compatible;
 }
 
 static void si_set_sampler_view(struct si_context *sctx,
 				unsigned shader,
 				unsigned slot, struct pipe_sampler_view *view,
 				bool disallow_early_out)
 {
 	struct si_samplers *samplers = &sctx->samplers[shader];
-	struct si_sampler_view *rview = (struct si_sampler_view*)view;
+	struct si_sampler_view *sview = (struct si_sampler_view*)view;
 	struct si_descriptors *descs = si_sampler_and_image_descriptors(sctx, shader);
 	unsigned desc_slot = si_get_sampler_slot(slot);
 	uint32_t *desc = descs->list + desc_slot * 16;
 
 	if (samplers->views[slot] == view && !disallow_early_out)
 		return;
 
 	if (view) {
 		struct si_texture *tex = (struct si_texture *)view->texture;
 
-		si_set_sampler_view_desc(sctx, rview,
+		si_set_sampler_view_desc(sctx, sview,
 					 samplers->sampler_states[slot], desc);
 
 		if (tex->buffer.b.b.target == PIPE_BUFFER) {
 			tex->buffer.bind_history |= PIPE_BIND_SAMPLER_VIEW;
 			samplers->needs_depth_decompress_mask &= ~(1u << slot);
 			samplers->needs_color_decompress_mask &= ~(1u << slot);
 		} else {
 			if (depth_needs_decompression(tex)) {
 				samplers->needs_depth_decompress_mask |= 1u << slot;
 			} else {
@@ -532,21 +532,21 @@ static void si_set_sampler_view(struct si_context *sctx,
 				sctx->need_check_render_feedback = true;
 		}
 
 		pipe_sampler_view_reference(&samplers->views[slot], view);
 		samplers->enabled_mask |= 1u << slot;
 
 		/* Since this can flush, it must be done after enabled_mask is
 		 * updated. */
 		si_sampler_view_add_buffer(sctx, view->texture,
 					   RADEON_USAGE_READ,
-					   rview->is_stencil_sampler, true);
+					   sview->is_stencil_sampler, true);
 	} else {
 		pipe_sampler_view_reference(&samplers->views[slot], NULL);
 		memcpy(desc, null_texture_descriptor, 8*4);
 		/* Only clear the lower dwords of FMASK. */
 		memcpy(desc + 8, null_texture_descriptor, 4*4);
 		/* Re-set the sampler state if we are transitioning from FMASK. */
 		if (samplers->sampler_states[slot])
 			si_set_sampler_state_desc(samplers->sampler_states[slot], NULL, NULL,
 						  desc + 12);
 
-- 
2.17.1