Mesa (main): radv: fix optimized MSAA copies with suballocated images

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 7a0cf7f6d192ed606520c5b77a3f542f28c954f2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7a0cf7f6d192ed606520c5b77a3f542f28c954f2

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Mon Jan 24 20:05:37 2022 +0000

radv: fix optimized MSAA copies with suballocated images

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Fixes: deb4685df39 ("radv: implement optimized MSAA copies using FMASK")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5829
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14705>

---

 src/amd/vulkan/radv_meta_fmask_copy.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/amd/vulkan/radv_meta_fmask_copy.c b/src/amd/vulkan/radv_meta_fmask_copy.c
index b52eedb3c5f..b9aa156e88a 100644
--- a/src/amd/vulkan/radv_meta_fmask_copy.c
+++ b/src/amd/vulkan/radv_meta_fmask_copy.c
@@ -238,8 +238,8 @@ radv_fixup_copy_dst_metadata(struct radv_cmd_buffer *cmd_buffer, const struct ra
 
    /* Copy CMASK+FMASK. */
    size = src_image->planes[0].surface.cmask_size + src_image->planes[0].surface.fmask_size;
-   src_offset = src_image->planes[0].surface.fmask_offset;
-   dst_offset = dst_image->planes[0].surface.fmask_offset;
+   src_offset = src_image->offset + src_image->planes[0].surface.fmask_offset;
+   dst_offset = dst_image->offset + dst_image->planes[0].surface.fmask_offset;
 
    radv_copy_buffer(cmd_buffer, src_image->bo, dst_image->bo, src_offset, dst_offset, size);
 }