Fixed initial layout (changed to undefined) during transitioning swapchain image after acquisition (both inside a pipeline barrier and render pass) in the rest of tutorials (04 to 07).

Ekzuzy · Ekzuzy · commit 47bb2a917795 · 2016-08-19T10:57:38.000+02:00
diff --git a/Project/Tutorial04/Tutorial04.cpp b/Project/Tutorial04/Tutorial04.cpp
@@ -28,7 +28,7 @@ namespace ApiWithoutSecrets {
         VK_ATTACHMENT_STORE_OP_STORE,                   // VkAttachmentStoreOp            storeOp
         VK_ATTACHMENT_LOAD_OP_DONT_CARE,                // VkAttachmentLoadOp             stencilLoadOp
         VK_ATTACHMENT_STORE_OP_DONT_CARE,               // VkAttachmentStoreOp            stencilStoreOp
-        VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,                // VkImageLayout                  initialLayout;
+        VK_IMAGE_LAYOUT_UNDEFINED,                      // VkImageLayout                  initialLayout;
         VK_IMAGE_LAYOUT_PRESENT_SRC_KHR                 // VkImageLayout                  finalLayout
       }
     };
@@ -533,7 +533,7 @@ namespace ApiWithoutSecrets {
         nullptr,                                          // const void                            *pNext
         VK_ACCESS_MEMORY_READ_BIT,                        // VkAccessFlags                          srcAccessMask
         VK_ACCESS_MEMORY_READ_BIT,                        // VkAccessFlags                          dstAccessMask
-        VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,                  // VkImageLayout                          oldLayout
+        VK_IMAGE_LAYOUT_UNDEFINED,                        // VkImageLayout                          oldLayout
         VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,                  // VkImageLayout                          newLayout
         GetPresentQueue().FamilyIndex,                    // uint32_t                               srcQueueFamilyIndex
         GetGraphicsQueue().FamilyIndex,                   // uint32_t                               dstQueueFamilyIndex
diff --git a/Project/Tutorial05/Tutorial05.cpp b/Project/Tutorial05/Tutorial05.cpp
@@ -112,7 +112,7 @@ namespace ApiWithoutSecrets {
         VK_ATTACHMENT_STORE_OP_STORE,                   // VkAttachmentStoreOp            storeOp
         VK_ATTACHMENT_LOAD_OP_DONT_CARE,                // VkAttachmentLoadOp             stencilLoadOp
         VK_ATTACHMENT_STORE_OP_DONT_CARE,               // VkAttachmentStoreOp            stencilStoreOp
-        VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,                // VkImageLayout                  initialLayout;
+        VK_IMAGE_LAYOUT_UNDEFINED,                      // VkImageLayout                  initialLayout;
         VK_IMAGE_LAYOUT_PRESENT_SRC_KHR                 // VkImageLayout                  finalLayout
       }
     };
@@ -606,7 +606,7 @@ namespace ApiWithoutSecrets {
         nullptr,                                        // const void                            *pNext
         VK_ACCESS_MEMORY_READ_BIT,                      // VkAccessFlags                          srcAccessMask
         VK_ACCESS_MEMORY_READ_BIT,                      // VkAccessFlags                          dstAccessMask
-        VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,                // VkImageLayout                          oldLayout
+        VK_IMAGE_LAYOUT_UNDEFINED,                      // VkImageLayout                          oldLayout
         VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,                // VkImageLayout                          newLayout
         GetPresentQueue().FamilyIndex,                  // uint32_t                               srcQueueFamilyIndex
         GetGraphicsQueue().FamilyIndex,                 // uint32_t                               dstQueueFamilyIndex
diff --git a/Project/Tutorial06/Tutorial06.cpp b/Project/Tutorial06/Tutorial06.cpp
@@ -937,7 +937,7 @@ namespace ApiWithoutSecrets {
       nullptr,                                            // const void                            *pNext
       VK_ACCESS_MEMORY_READ_BIT,                          // VkAccessFlags                          srcAccessMask
       VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,               // VkAccessFlags                          dstAccessMask
-      VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,                    // VkImageLayout                          oldLayout
+      VK_IMAGE_LAYOUT_UNDEFINED,                          // VkImageLayout                          oldLayout
       VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,           // VkImageLayout                          newLayout
       present_queue_family_index,                         // uint32_t                               srcQueueFamilyIndex
       graphics_queue_family_index,                        // uint32_t                               dstQueueFamilyIndex
diff --git a/Project/Tutorial07/Tutorial07.cpp b/Project/Tutorial07/Tutorial07.cpp
@@ -1072,7 +1072,7 @@ namespace ApiWithoutSecrets {
       nullptr,                                            // const void                            *pNext
       VK_ACCESS_MEMORY_READ_BIT,                          // VkAccessFlags                          srcAccessMask
       VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,               // VkAccessFlags                          dstAccessMask
-      VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,                    // VkImageLayout                          oldLayout
+      VK_IMAGE_LAYOUT_UNDEFINED,                          // VkImageLayout                          oldLayout
       VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,           // VkImageLayout                          newLayout
       present_queue_family_index,                         // uint32_t                               srcQueueFamilyIndex
       graphics_queue_family_index,                        // uint32_t                               dstQueueFamilyIndex
