From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Tue, 31 Mar 2020 13:09:58 +0000 (+0200)
Subject: radv: rename decompress/resummarize depth/stencil functions
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8b7586655fbbcc52de47cc110aa145e3703929cc;p=mesa.git

radv: rename decompress/resummarize depth/stencil functions

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4389>
---

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 81b705893f7..f3e3de8dafd 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -5386,8 +5386,8 @@ static void radv_handle_depth_image_transition(struct radv_cmd_buffer *cmd_buffe
 		cmd_buffer->state.flush_bits |= RADV_CMD_FLAG_FLUSH_AND_INV_DB |
 		                                RADV_CMD_FLAG_FLUSH_AND_INV_DB_META;
 
-		radv_decompress_depth_image_inplace(cmd_buffer, image, range,
-						    sample_locs);
+		radv_decompress_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 abe37789863..f7b19477265 100644
--- a/src/amd/vulkan/radv_meta.h
+++ b/src/amd/vulkan/radv_meta.h
@@ -167,14 +167,14 @@ 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_image_inplace(struct radv_cmd_buffer *cmd_buffer,
-					 struct radv_image *image,
-					 const VkImageSubresourceRange *subresourceRange,
-					 struct radv_sample_locations_state *sample_locs);
-void radv_resummarize_depth_image_inplace(struct radv_cmd_buffer *cmd_buffer,
-					  struct radv_image *image,
-					  const VkImageSubresourceRange *subresourceRange,
-					  struct radv_sample_locations_state *sample_locs);
+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_resummarize_depth_stencil(struct radv_cmd_buffer *cmd_buffer,
+				    struct radv_image *image,
+				    const VkImageSubresourceRange *subresourceRange,
+				    struct radv_sample_locations_state *sample_locs);
 void radv_fast_clear_flush_image_inplace(struct radv_cmd_buffer *cmd_buffer,
 					 struct radv_image *image,
 					 const VkImageSubresourceRange *subresourceRange);
diff --git a/src/amd/vulkan/radv_meta_decompress.c b/src/amd/vulkan/radv_meta_decompress.c
index 8046adabdba..8fc264defe5 100644
--- a/src/amd/vulkan/radv_meta_decompress.c
+++ b/src/amd/vulkan/radv_meta_decompress.c
@@ -482,11 +482,11 @@ radv_process_depth_image_layer(struct radv_cmd_buffer *cmd_buffer,
 				&cmd_buffer->pool->alloc);
 }
 
-static void radv_process_depth_image_inplace(struct radv_cmd_buffer *cmd_buffer,
-					     struct radv_image *image,
-					     const VkImageSubresourceRange *subresourceRange,
-					     struct radv_sample_locations_state *sample_locs,
-					     enum radv_depth_op op)
+static void radv_process_depth_stencil(struct radv_cmd_buffer *cmd_buffer,
+				       struct radv_image *image,
+				       const VkImageSubresourceRange *subresourceRange,
+				       struct radv_sample_locations_state *sample_locs,
+				       enum radv_depth_op op)
 {
 	struct radv_meta_saved_state saved_state;
 	VkCommandBuffer cmd_buffer_h = radv_cmd_buffer_to_handle(cmd_buffer);
@@ -554,10 +554,10 @@ static void radv_process_depth_image_inplace(struct radv_cmd_buffer *cmd_buffer,
 	radv_meta_restore(&saved_state, cmd_buffer);
 }
 
-void radv_decompress_depth_image_inplace(struct radv_cmd_buffer *cmd_buffer,
-					 struct radv_image *image,
-					 const VkImageSubresourceRange *subresourceRange,
-					 struct radv_sample_locations_state *sample_locs)
+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)
 {
 	struct radv_barrier_data barrier = {};
 
@@ -565,14 +565,14 @@ void radv_decompress_depth_image_inplace(struct radv_cmd_buffer *cmd_buffer,
 	radv_describe_layout_transition(cmd_buffer, &barrier);
 
 	assert(cmd_buffer->queue_family_index == RADV_QUEUE_GENERAL);
-	radv_process_depth_image_inplace(cmd_buffer, image, subresourceRange,
-					 sample_locs, DEPTH_DECOMPRESS);
+	radv_process_depth_stencil(cmd_buffer, image, subresourceRange,
+				   sample_locs, DEPTH_DECOMPRESS);
 }
 
-void radv_resummarize_depth_image_inplace(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)
 {
 	struct radv_barrier_data barrier = {};
 
@@ -580,6 +580,6 @@ void radv_resummarize_depth_image_inplace(struct radv_cmd_buffer *cmd_buffer,
 	radv_describe_layout_transition(cmd_buffer, &barrier);
 
 	assert(cmd_buffer->queue_family_index == RADV_QUEUE_GENERAL);
-	radv_process_depth_image_inplace(cmd_buffer, image, subresourceRange,
-					 sample_locs, DEPTH_RESUMMARIZE);
+	radv_process_depth_stencil(cmd_buffer, image, subresourceRange,
+				   sample_locs, DEPTH_RESUMMARIZE);
 }