From 4570b34456d098e687a4ffbab92773222b08e0b8 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Thu, 19 Sep 2019 18:21:16 +0200
Subject: [PATCH] [dxvk] Add initial layout to image create info

---
 src/dxvk/dxvk_image.cpp | 2 +-
 src/dxvk/dxvk_image.h   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/dxvk/dxvk_image.cpp b/src/dxvk/dxvk_image.cpp
index 5a682c5b..162527b7 100644
--- a/src/dxvk/dxvk_image.cpp
+++ b/src/dxvk/dxvk_image.cpp
@@ -38,7 +38,7 @@ namespace dxvk {
     info.sharingMode           = VK_SHARING_MODE_EXCLUSIVE;
     info.queueFamilyIndexCount = 0;
     info.pQueueFamilyIndices   = nullptr;
-    info.initialLayout         = VK_IMAGE_LAYOUT_UNDEFINED;
+    info.initialLayout         = createInfo.initialLayout;
     
     if (m_vkd->vkCreateImage(m_vkd->device(),
           &info, nullptr, &m_image) != VK_SUCCESS) {
diff --git a/src/dxvk/dxvk_image.h b/src/dxvk/dxvk_image.h
index 31b3f8ab..8f82d65a 100644
--- a/src/dxvk/dxvk_image.h
+++ b/src/dxvk/dxvk_image.h
@@ -52,6 +52,9 @@ namespace dxvk {
     /// Common image layout
     VkImageLayout layout;
 
+    // Initial image layout
+    VkImageLayout initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+
     // Image view formats that can
     // be used with this image
     uint32_t        viewFormatCount = 0;