From 7b7debe8f9b737e2f8b65930a3f52389cd508fe2 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 28 Dec 2021 10:38:41 +0100 Subject: [PATCH] radv: fix restoring subpass during hw/fs color resolves This fixes an stack-use-after-scope detect by ASAN because the subpass is used after the loop by radv_mark_noncoherent_rb(). Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/radv_meta_resolve.c | 4 ++-- src/amd/vulkan/radv_meta_resolve_fs.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/amd/vulkan/radv_meta_resolve.c b/src/amd/vulkan/radv_meta_resolve.c index 7179562..94b5af2 100644 --- a/src/amd/vulkan/radv_meta_resolve.c +++ b/src/amd/vulkan/radv_meta_resolve.c @@ -728,9 +728,9 @@ radv_cmd_buffer_resolve_subpass_hw(struct radv_cmd_buffer *cmd_buffer) emit_resolve(cmd_buffer, src_img, dst_img, dest_iview->vk_format, &(VkOffset2D){0, 0}, &(VkExtent2D){fb->width, fb->height}); - } - radv_cmd_buffer_restore_subpass(cmd_buffer, subpass); + radv_cmd_buffer_restore_subpass(cmd_buffer, subpass); + } radv_meta_restore(&saved_state, cmd_buffer); } diff --git a/src/amd/vulkan/radv_meta_resolve_fs.c b/src/amd/vulkan/radv_meta_resolve_fs.c index c4a59ad..242f1fd 100644 --- a/src/amd/vulkan/radv_meta_resolve_fs.c +++ b/src/amd/vulkan/radv_meta_resolve_fs.c @@ -1106,9 +1106,9 @@ radv_cmd_buffer_resolve_subpass_fs(struct radv_cmd_buffer *cmd_buffer) emit_resolve(cmd_buffer, src_iview, dest_iview, &(VkOffset2D){0, 0}, &(VkOffset2D){0, 0}, &(VkExtent2D){fb->width, fb->height}); - } - radv_cmd_buffer_restore_subpass(cmd_buffer, subpass); + radv_cmd_buffer_restore_subpass(cmd_buffer, subpass); + } radv_meta_restore(&saved_state, cmd_buffer); } -- 2.7.4