Mesa (master): radv: make sure to not clear the ds attachment after resolves

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Wed Nov  6 13:55:08 2019 +0100

radv: make sure to not clear the ds attachment after resolves

To not overwrite the resolve if there is pending clear aspects,
same as color resolves.

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 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/amd/vulkan/radv_meta_resolve.c b/src/amd/vulkan/radv_meta_resolve.c
index ea3d26c8d4c..d59802ba813 100644
--- a/src/amd/vulkan/radv_meta_resolve.c
+++ b/src/amd/vulkan/radv_meta_resolve.c
@@ -649,6 +649,9 @@ radv_cmd_buffer_resolve_subpass(struct radv_cmd_buffer *cmd_buffer)
 		struct radv_image_view *dst_iview =
 			cmd_buffer->state.attachments[dst_att.attachment].iview;
 
+		/* Make sure to not clear the depth/stencil attachment after resolves. */
+		cmd_buffer->state.attachments[dst_att.attachment].pending_clear_aspects = 0;
+
 		radv_pick_resolve_method_images(cmd_buffer->device,
 						src_iview->image,
 						src_iview->vk_format,