Module: Mesa Branch: main Commit: 966b78099295b80722e5c8b76045307e827733d2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=966b78099295b80722e5c8b76045307e827733d2
Author: Samuel Pitoiset <[email protected]> Date: Wed Aug 18 16:48:31 2021 +0200 radv: rename radv_decompress_depth_stencil() To radv_expand_depth_stencil() for consistency. Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Bas Nieuwenhhuizen <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12452> --- src/amd/vulkan/radv_cmd_buffer.c | 2 +- src/amd/vulkan/radv_meta.h | 6 +++--- src/amd/vulkan/radv_meta_decompress.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index bc0c1da8e59..f4bedf39e57 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -6681,7 +6681,7 @@ radv_handle_depth_image_transition(struct radv_cmd_buffer *cmd_buffer, struct ra cmd_buffer->state.flush_bits |= RADV_CMD_FLAG_FLUSH_AND_INV_DB | RADV_CMD_FLAG_FLUSH_AND_INV_DB_META; - radv_decompress_depth_stencil(cmd_buffer, image, range, sample_locs); + radv_expand_depth_stencil(cmd_buffer, image, range, sample_locs); cmd_buffer->state.flush_bits |= RADV_CMD_FLAG_FLUSH_AND_INV_DB | RADV_CMD_FLAG_FLUSH_AND_INV_DB_META; diff --git a/src/amd/vulkan/radv_meta.h b/src/amd/vulkan/radv_meta.h index 7500b892e6f..81ed74769c6 100644 --- a/src/amd/vulkan/radv_meta.h +++ b/src/amd/vulkan/radv_meta.h @@ -205,9 +205,9 @@ void radv_meta_image_to_image_cs(struct radv_cmd_buffer *cmd_buffer, void radv_meta_clear_image_cs(struct radv_cmd_buffer *cmd_buffer, struct radv_meta_blit2d_surf *dst, const VkClearColorValue *clear_color); -void radv_decompress_depth_stencil(struct radv_cmd_buffer *cmd_buffer, struct radv_image *image, - const VkImageSubresourceRange *subresourceRange, - struct radv_sample_locations_state *sample_locs); +void radv_expand_depth_stencil(struct radv_cmd_buffer *cmd_buffer, struct radv_image *image, + const VkImageSubresourceRange *subresourceRange, + struct radv_sample_locations_state *sample_locs); void radv_resummarize_depth_stencil(struct radv_cmd_buffer *cmd_buffer, struct radv_image *image, const VkImageSubresourceRange *subresourceRange, struct radv_sample_locations_state *sample_locs); diff --git a/src/amd/vulkan/radv_meta_decompress.c b/src/amd/vulkan/radv_meta_decompress.c index 6f0b644531d..1f1d8758c20 100644 --- a/src/amd/vulkan/radv_meta_decompress.c +++ b/src/amd/vulkan/radv_meta_decompress.c @@ -482,9 +482,9 @@ radv_process_depth_stencil(struct radv_cmd_buffer *cmd_buffer, struct radv_image } void -radv_decompress_depth_stencil(struct radv_cmd_buffer *cmd_buffer, struct radv_image *image, - const VkImageSubresourceRange *subresourceRange, - struct radv_sample_locations_state *sample_locs) +radv_expand_depth_stencil(struct radv_cmd_buffer *cmd_buffer, struct radv_image *image, + const VkImageSubresourceRange *subresourceRange, + struct radv_sample_locations_state *sample_locs) { struct radv_barrier_data barrier = {0};
