From 23cdde5138b183c6225f1009cb6233cacfaf32e6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 2 Oct 2017 17:03:01 +0200 Subject: [PATCH] radeonsi: rename si_textures_info -> si_samplers, si_images_info -> si_images MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Samuel Pitoiset Reviewed-by: Nicolai Hähnle --- src/gallium/drivers/radeonsi/si_blit.c | 10 ++++----- src/gallium/drivers/radeonsi/si_descriptors.c | 22 +++++++++---------- src/gallium/drivers/radeonsi/si_pipe.h | 8 +++---- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c index b8ff67d5ab7..957254be66c 100644 --- a/src/gallium/drivers/radeonsi/si_blit.c +++ b/src/gallium/drivers/radeonsi/si_blit.c @@ -421,7 +421,7 @@ si_decompress_depth(struct si_context *sctx, static void si_decompress_sampler_depth_textures(struct si_context *sctx, - struct si_textures_info *textures) + struct si_samplers *textures) { unsigned i; unsigned mask = textures->needs_depth_decompress_mask; @@ -548,7 +548,7 @@ si_decompress_color_texture(struct si_context *sctx, struct r600_texture *tex, static void si_decompress_sampler_color_textures(struct si_context *sctx, - struct si_textures_info *textures) + struct si_samplers *textures) { unsigned i; unsigned mask = textures->needs_color_decompress_mask; @@ -571,7 +571,7 @@ si_decompress_sampler_color_textures(struct si_context *sctx, static void si_decompress_image_color_textures(struct si_context *sctx, - struct si_images_info *images) + struct si_images *images) { unsigned i; unsigned mask = images->needs_color_decompress_mask; @@ -627,7 +627,7 @@ static void si_check_render_feedback_texture(struct si_context *sctx, } static void si_check_render_feedback_textures(struct si_context *sctx, - struct si_textures_info *textures) + struct si_samplers *textures) { uint32_t mask = textures->views.enabled_mask; @@ -652,7 +652,7 @@ static void si_check_render_feedback_textures(struct si_context *sctx, } static void si_check_render_feedback_images(struct si_context *sctx, - struct si_images_info *images) + struct si_images *images) { uint32_t mask = images->enabled_mask; diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index 38350468819..788e7c35f66 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -465,7 +465,7 @@ static void si_set_sampler_view(struct si_context *sctx, unsigned slot, struct pipe_sampler_view *view, bool disallow_early_out) { - struct si_textures_info *samplers = &sctx->samplers[shader]; + struct si_samplers *samplers = &sctx->samplers[shader]; struct si_sampler_views *views = &samplers->views; struct si_sampler_view *rview = (struct si_sampler_view*)view; struct si_descriptors *descs = si_sampler_and_image_descriptors(sctx, shader); @@ -531,7 +531,7 @@ static void si_set_sampler_view(struct si_context *sctx, static void si_update_shader_needs_decompress_mask(struct si_context *sctx, unsigned shader) { - struct si_textures_info *samplers = &sctx->samplers[shader]; + struct si_samplers *samplers = &sctx->samplers[shader]; unsigned shader_bit = 1 << shader; if (samplers->needs_depth_decompress_mask || @@ -565,7 +565,7 @@ static void si_set_sampler_views(struct pipe_context *ctx, } static void -si_samplers_update_needs_color_decompress_mask(struct si_textures_info *samplers) +si_samplers_update_needs_color_decompress_mask(struct si_samplers *samplers) { unsigned mask = samplers->views.enabled_mask; @@ -588,7 +588,7 @@ si_samplers_update_needs_color_decompress_mask(struct si_textures_info *samplers /* IMAGE VIEWS */ static void -si_release_image_views(struct si_images_info *images) +si_release_image_views(struct si_images *images) { unsigned i; @@ -600,7 +600,7 @@ si_release_image_views(struct si_images_info *images) } static void -si_image_views_begin_new_cs(struct si_context *sctx, struct si_images_info *images) +si_image_views_begin_new_cs(struct si_context *sctx, struct si_images *images) { uint mask = images->enabled_mask; @@ -619,7 +619,7 @@ si_image_views_begin_new_cs(struct si_context *sctx, struct si_images_info *imag static void si_disable_shader_image(struct si_context *ctx, unsigned shader, unsigned slot) { - struct si_images_info *images = &ctx->images[shader]; + struct si_images *images = &ctx->images[shader]; if (images->enabled_mask & (1u << slot)) { struct si_descriptors *descs = si_sampler_and_image_descriptors(ctx, shader); @@ -728,7 +728,7 @@ static void si_set_shader_image(struct si_context *ctx, unsigned slot, const struct pipe_image_view *view, bool skip_decompress) { - struct si_images_info *images = &ctx->images[shader]; + struct si_images *images = &ctx->images[shader]; struct si_descriptors *descs = si_sampler_and_image_descriptors(ctx, shader); struct r600_resource *res; unsigned desc_slot = si_get_image_slot(slot); @@ -802,7 +802,7 @@ si_set_shader_images(struct pipe_context *pipe, } static void -si_images_update_needs_color_decompress_mask(struct si_images_info *images) +si_images_update_needs_color_decompress_mask(struct si_images *images) { unsigned mask = images->enabled_mask; @@ -829,7 +829,7 @@ static void si_bind_sampler_states(struct pipe_context *ctx, unsigned start, unsigned count, void **states) { struct si_context *sctx = (struct si_context *)ctx; - struct si_textures_info *samplers = &sctx->samplers[shader]; + struct si_samplers *samplers = &sctx->samplers[shader]; struct si_descriptors *desc = si_sampler_and_image_descriptors(sctx, shader); struct si_sampler_state **sstates = (struct si_sampler_state**)states; int i; @@ -1712,7 +1712,7 @@ static void si_rebind_buffer(struct pipe_context *ctx, struct pipe_resource *buf /* Shader images */ if (rbuffer->bind_history & PIPE_BIND_SHADER_IMAGE) { for (shader = 0; shader < SI_NUM_SHADERS; ++shader) { - struct si_images_info *images = &sctx->images[shader]; + struct si_images *images = &sctx->images[shader]; struct si_descriptors *descs = si_sampler_and_image_descriptors(sctx, shader); unsigned mask = images->enabled_mask; @@ -1949,7 +1949,7 @@ void si_update_all_texture_descriptors(struct si_context *sctx) for (shader = 0; shader < SI_NUM_SHADERS; shader++) { struct si_sampler_views *samplers = &sctx->samplers[shader].views; - struct si_images_info *images = &sctx->images[shader]; + struct si_images *images = &sctx->images[shader]; unsigned mask; /* Images. */ diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index ed88aa0521b..212d163686c 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -181,13 +181,13 @@ struct si_cs_shader_state { bool uses_scratch; }; -struct si_textures_info { +struct si_samplers { struct si_sampler_views views; uint32_t needs_depth_decompress_mask; uint32_t needs_color_decompress_mask; }; -struct si_images_info { +struct si_images { struct pipe_image_view views[SI_NUM_IMAGES]; uint32_t needs_color_decompress_mask; unsigned enabled_mask; @@ -379,8 +379,8 @@ struct si_context { unsigned shader_needs_decompress_mask; struct si_buffer_resources rw_buffers; struct si_buffer_resources const_and_shader_buffers[SI_NUM_SHADERS]; - struct si_textures_info samplers[SI_NUM_SHADERS]; - struct si_images_info images[SI_NUM_SHADERS]; + struct si_samplers samplers[SI_NUM_SHADERS]; + struct si_images images[SI_NUM_SHADERS]; /* other shader resources */ struct pipe_constant_buffer null_const_buf; /* used for set_constant_buffer(NULL) on CIK */ -- 2.30.2