Conor McCarthy : tests/d3d12: Test format D32_FLOAT_S8X24_UINT in test_get_copyable_footprints().

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 0daba96025558e2a4b96b00c88ad2a4cff8e6b35
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/0daba96025558e2a4b96b00c88ad2a...

Author: Conor McCarthy <cmccarthy(a)codeweavers.com>
Date:   Mon Apr 22 16:32:21 2024 +1000

tests/d3d12: Test format D32_FLOAT_S8X24_UINT in test_get_copyable_footprints().

---

 tests/d3d12.c            | 3 ++-
 tests/d3d12_test_utils.h | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/d3d12.c b/tests/d3d12.c
index 820473ee..83990ada 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -20248,6 +20248,7 @@ static void test_get_copyable_footprints(void)
         {DXGI_FORMAT_BC7_UNORM, true},
         {DXGI_FORMAT_D32_FLOAT, false, true},
         {DXGI_FORMAT_D24_UNORM_S8_UINT, false, true},
+        {DXGI_FORMAT_D32_FLOAT_S8X24_UINT, false, true},
     };
     static const uint64_t base_offsets[] =
     {
@@ -20349,7 +20350,7 @@ static void test_get_copyable_footprints(void)
             sub_resource_count = resource_desc.MipLevels;
             if (resources[i].dimension != D3D12_RESOURCE_DIMENSION_TEXTURE3D)
                 sub_resource_count *= resource_desc.DepthOrArraySize;
-            if (resource_desc.Format == DXGI_FORMAT_D24_UNORM_S8_UINT)
+            if (format_plane_count(resource_desc.Format) > 1)
             {
                 /* FIXME: we require D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL here for DS formats but windows doesn't. */
                 if (!vkd3d_test_platform_is_windows())
diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h
index 408adc4d..28cf2aad 100644
--- a/tests/d3d12_test_utils.h
+++ b/tests/d3d12_test_utils.h
@@ -314,6 +314,7 @@ static unsigned int format_size(DXGI_FORMAT format)
         case DXGI_FORMAT_R8G8_UNORM:
             return 16;
         case DXGI_FORMAT_R16G16B16A16_TYPELESS:
+        case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
             return 8;
         case DXGI_FORMAT_R32_TYPELESS:
         case DXGI_FORMAT_D32_FLOAT: