Conor McCarthy : vkd3d: Always pass null heap properties to vkd3d_create_image() for sparse images.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: e93f2e7746c32f1996e0e5c21bc63a992adf8575
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/e93f2e7746c32f1996e0e5c21bc63a...

Author: Conor McCarthy <cmccarthy(a)codeweavers.com>
Date:   Fri May 26 12:24:03 2023 +1000

vkd3d: Always pass null heap properties to vkd3d_create_image() for sparse images.

---

 libs/vkd3d/resource.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c
index 59eddb38..7b6c75b5 100644
--- a/libs/vkd3d/resource.c
+++ b/libs/vkd3d/resource.c
@@ -943,6 +943,7 @@ HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device,
     D3D12_RESOURCE_DESC validated_desc;
     VkMemoryRequirements requirements;
     VkImage vk_image;
+    bool tiled;
     HRESULT hr;
 
     assert(desc->Dimension != D3D12_RESOURCE_DIMENSION_BUFFER);
@@ -955,8 +956,10 @@ HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device,
         desc = &validated_desc;
     }
 
+    tiled = desc->Layout == D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE;
+
     /* XXX: We have to create an image to get its memory requirements. */
-    if (SUCCEEDED(hr = vkd3d_create_image(device, &heap_properties, 0, desc, NULL, &vk_image)))
+    if (SUCCEEDED(hr = vkd3d_create_image(device, tiled ? NULL : &heap_properties, 0, desc, NULL, &vk_image)))
     {
         VK_CALL(vkGetImageMemoryRequirements(device->vk_device, vk_image, &requirements));
         VK_CALL(vkDestroyImage(device->vk_device, vk_image, NULL));