From 2792ec2cdde1055cfa04ea876ad4047f938d5315 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 18 Jan 2019 19:35:33 -0500 Subject: [PATCH] radeonsi: rename rview -> sview Reviewed-by: Bas Nieuwenhuizen --- 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 ca62848296b..a00e535f08d 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -497,7 +497,7 @@ static void si_set_sampler_view(struct si_context *sctx, 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; @@ -508,7 +508,7 @@ static void si_set_sampler_view(struct si_context *sctx, 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) { @@ -539,7 +539,7 @@ static void si_set_sampler_view(struct si_context *sctx, * 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); -- 2.30.2