Mesa (master): radv: rename has_resolve to has_color_resolve

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: ac6369a2d0dbcaa94b259099d42e957a726bcd22
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ac6369a2d0dbcaa94b259099d42e957a726bcd22

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Wed Jun 12 10:20:41 2019 +0200

radv: rename has_resolve to has_color_resolve

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

---

 src/amd/vulkan/radv_meta_resolve.c | 2 +-
 src/amd/vulkan/radv_pass.c         | 4 ++--
 src/amd/vulkan/radv_private.h      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/amd/vulkan/radv_meta_resolve.c b/src/amd/vulkan/radv_meta_resolve.c
index d5c387d164f..9ccb641d0bf 100644
--- a/src/amd/vulkan/radv_meta_resolve.c
+++ b/src/amd/vulkan/radv_meta_resolve.c
@@ -629,7 +629,7 @@ radv_cmd_buffer_resolve_subpass(struct radv_cmd_buffer *cmd_buffer)
 	struct radv_meta_saved_state saved_state;
 	enum radv_resolve_method resolve_method = RESOLVE_HW;
 
-	if (!subpass->has_resolve)
+	if (!subpass->has_color_resolve)
 		return;
 
 	for (uint32_t i = 0; i < subpass->color_count; ++i) {
diff --git a/src/amd/vulkan/radv_pass.c b/src/amd/vulkan/radv_pass.c
index 8fa098eaac8..728b6113206 100644
--- a/src/amd/vulkan/radv_pass.c
+++ b/src/amd/vulkan/radv_pass.c
@@ -132,7 +132,7 @@ radv_render_pass_compile(struct radv_render_pass *pass)
 						 depth_sample_count);
 
 		/* We have to handle resolve attachments specially */
-		subpass->has_resolve = false;
+		subpass->has_color_resolve = false;
 		if (subpass->resolve_attachments) {
 			for (uint32_t j = 0; j < subpass->color_count; j++) {
 				struct radv_subpass_attachment *resolve_att =
@@ -141,7 +141,7 @@ radv_render_pass_compile(struct radv_render_pass *pass)
 				if (resolve_att->attachment == VK_ATTACHMENT_UNUSED)
 					continue;
 
-				subpass->has_resolve = true;
+				subpass->has_color_resolve = true;
 			}
 		}
 	}
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 14bf55e9bd3..6cebc738d49 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -1954,8 +1954,8 @@ struct radv_subpass {
 	struct radv_subpass_attachment *             resolve_attachments;
 	struct radv_subpass_attachment *             depth_stencil_attachment;
 
-	/** Subpass has at least one resolve attachment */
-	bool                                         has_resolve;
+	/** Subpass has at least one color resolve attachment */
+	bool                                         has_color_resolve;
 
 	/** Subpass has at least one color attachment */
 	bool                                         has_color_att;