From: Chad Versace <chad.versace@intel.com>
Date: Tue, 18 Aug 2015 19:39:28 +0000 (-0700)
Subject: vk/meta: Fix dest format of vkCmdCopyImage
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bd0aab9a5892387daf0a2a4badc39d27dda73033;p=mesa.git

vk/meta: Fix dest format of vkCmdCopyImage

The source image's format was incorrectly used for both the source view
and destination view. For vkCmdCopyImage to correctly translate formats,
the destination view's format must be that of the destination image's.
---

diff --git a/src/vulkan/anv_meta.c b/src/vulkan/anv_meta.c
index bec8455c873..a433d132562 100644
--- a/src/vulkan/anv_meta.c
+++ b/src/vulkan/anv_meta.c
@@ -899,6 +899,7 @@ void anv_CmdCopyImage(
 {
    ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, cmdBuffer);
    ANV_FROM_HANDLE(anv_image, src_image, srcImage);
+   ANV_FROM_HANDLE(anv_image, dest_image, destImage);
 
    struct anv_saved_state saved_state;
 
@@ -933,7 +934,7 @@ void anv_CmdCopyImage(
          &(VkAttachmentViewCreateInfo) {
             .sType = VK_STRUCTURE_TYPE_ATTACHMENT_VIEW_CREATE_INFO,
             .image = destImage,
-            .format = src_image->format->vk_format,
+            .format = dest_image->format->vk_format,
             .mipLevel = pRegions[r].destSubresource.mipLevel,
             .baseArraySlice = pRegions[r].destSubresource.arraySlice,
             .arraySize = 1,