From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Date: Sat, 24 Jun 2017 18:23:44 +0000 (+0200)
Subject: radv: Use correct image layout for blit based copies.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=789f480029500d2aae7e5131b216e5a1cde92bc8;p=mesa.git

radv: Use correct image layout for blit based copies.

v2: Don't pass layout to image view usage mask.

Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Fixes: 0628580eff6 "radv: Specify semantics of HTILE layout helpers."
---

diff --git a/src/amd/vulkan/radv_meta_blit2d.c b/src/amd/vulkan/radv_meta_blit2d.c
index aae35d2a79e..7d12d6cb559 100644
--- a/src/amd/vulkan/radv_meta_blit2d.c
+++ b/src/amd/vulkan/radv_meta_blit2d.c
@@ -713,8 +713,8 @@ blit2d_init_color_pipeline(struct radv_device *device,
 						       .format = format,
 						       .loadOp = VK_ATTACHMENT_LOAD_OP_LOAD,
 						       .storeOp = VK_ATTACHMENT_STORE_OP_STORE,
-						       .initialLayout = VK_IMAGE_LAYOUT_GENERAL,
-						       .finalLayout = VK_IMAGE_LAYOUT_GENERAL,
+						       .initialLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+						       .finalLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
 						       },
 					       .subpassCount = 1,
 					       .pSubpasses = &(VkSubpassDescription) {
@@ -723,12 +723,12 @@ blit2d_init_color_pipeline(struct radv_device *device,
 						       .colorAttachmentCount = 1,
 						       .pColorAttachments = &(VkAttachmentReference) {
 							       .attachment = 0,
-							       .layout = VK_IMAGE_LAYOUT_GENERAL,
+							       .layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
 							},
 					       .pResolveAttachments = NULL,
 					       .pDepthStencilAttachment = &(VkAttachmentReference) {
 						       .attachment = VK_ATTACHMENT_UNUSED,
-						       .layout = VK_IMAGE_LAYOUT_GENERAL,
+						       .layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
 					       },
 					       .preserveAttachmentCount = 1,
 					       .pPreserveAttachments = (uint32_t[]) { 0 },
@@ -871,8 +871,8 @@ blit2d_init_depth_only_pipeline(struct radv_device *device,
 							       .format = 0,
 							       .loadOp = VK_ATTACHMENT_LOAD_OP_LOAD,
 							       .storeOp = VK_ATTACHMENT_STORE_OP_STORE,
-							       .initialLayout = VK_IMAGE_LAYOUT_GENERAL,
-							       .finalLayout = VK_IMAGE_LAYOUT_GENERAL,
+							       .initialLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+							       .finalLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
 						       },
 						       .subpassCount = 1,
 						       .pSubpasses = &(VkSubpassDescription) {
@@ -883,7 +883,7 @@ blit2d_init_depth_only_pipeline(struct radv_device *device,
 						       .pResolveAttachments = NULL,
 						       .pDepthStencilAttachment = &(VkAttachmentReference) {
 							       .attachment = 0,
-							       .layout = VK_IMAGE_LAYOUT_GENERAL,
+							       .layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
 						       },
 						       .preserveAttachmentCount = 1,
 						       .pPreserveAttachments = (uint32_t[]) { 0 },
@@ -1026,8 +1026,8 @@ blit2d_init_stencil_only_pipeline(struct radv_device *device,
 							       .format = 0,
 							       .loadOp = VK_ATTACHMENT_LOAD_OP_LOAD,
 							       .storeOp = VK_ATTACHMENT_STORE_OP_STORE,
-							       .initialLayout = VK_IMAGE_LAYOUT_GENERAL,
-							       .finalLayout = VK_IMAGE_LAYOUT_GENERAL,
+							       .initialLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+							       .finalLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
 						       },
 						       .subpassCount = 1,
 						       .pSubpasses = &(VkSubpassDescription) {
@@ -1038,7 +1038,7 @@ blit2d_init_stencil_only_pipeline(struct radv_device *device,
 						       .pResolveAttachments = NULL,
 						       .pDepthStencilAttachment = &(VkAttachmentReference) {
 							       .attachment = 0,
-							       .layout = VK_IMAGE_LAYOUT_GENERAL,
+							       .layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
 						       },
 						       .preserveAttachmentCount = 1,
 						       .pPreserveAttachments = (uint32_t[]) { 0 },