From 450755bd4080aab6d69ad0c1e446d27ad8734671 Mon Sep 17 00:00:00 2001 From: Connor Abbott Date: Fri, 17 Jan 2025 15:59:42 -0500 Subject: [PATCH] tu: Use image view format for sysmem resolves The spec says that we're supposed to do this. This fixes the newly-introduced tests dEQP-VK.image.mutable.*.*_draw_copy_resolve with TU_DEBUG=sysmem. Cc: mesa-stable Part-of: --- src/freedreno/vulkan/tu_clear_blit.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/freedreno/vulkan/tu_clear_blit.cc b/src/freedreno/vulkan/tu_clear_blit.cc index 236c09b8b3f..60f4c71334c 100644 --- a/src/freedreno/vulkan/tu_clear_blit.cc +++ b/src/freedreno/vulkan/tu_clear_blit.cc @@ -3494,7 +3494,7 @@ tu_resolve_sysmem(struct tu_cmd_buffer *cmd, uint32_t layers, const VkRect2D *rect) { - assert(src->image->vk.format == dst->image->vk.format || + assert(src->vk.format == dst->vk.format || (vk_format_is_depth_or_stencil(src->image->vk.format) && vk_format_is_depth_or_stencil(dst->image->vk.format))); @@ -3509,7 +3509,7 @@ tu_resolve_sysmem(struct tu_cmd_buffer *cmd, src, dst, layer_mask, layers, rect, src_separate_ds, dst_separate_ds); } else { - resolve_sysmem(cmd, cs, src->image->vk.format, dst->image->vk.format, + resolve_sysmem(cmd, cs, src->vk.format, dst->vk.format, src, dst, layer_mask, layers, rect, src_separate_ds, dst_separate_ds); }