tests: Use currentExtent as swapchain size

artem-lunarg · artem-lunarg · commit 0032ceed1d7f · 2026-04-30T18:31:42.000+02:00
Current Windows ARM drivers report minImageExtent == 1x1 and it is not
equal to currentExtent (as required by the spec for Win32).

QueuePresent with 1x1 swapchain fails with ERROR_OUT_OF_DATE
diff --git a/tests/framework/render.cpp b/tests/framework/render.cpp
@@ -929,6 +929,17 @@ SurfaceInformation VkRenderFramework::GetSwapchainInfo(const VkSurfaceKHR surfac
     return info;
 }
 
+VkExtent2D VkRenderFramework::GetSwapchainExtent(const VkSurfaceCapabilitiesKHR& surface_caps) {
+    VkExtent2D swapchain_extent = surface_caps.currentExtent;
+
+    // If current extent uses special values then we are free to choose the size and just use the min extent
+    if (surface_caps.currentExtent.width == 0XFFFFFFFFu || surface_caps.currentExtent.height == 0XFFFFFFFFu) {
+        swapchain_extent = surface_caps.minImageExtent;
+    }
+
+    return swapchain_extent;
+}
+
 VkSwapchainCreateInfoKHR VkRenderFramework::GetDefaultSwapchainCreateInfo(VkSurfaceKHR surface,
                                                                           const SurfaceInformation& surface_info,
                                                                           VkImageUsageFlags image_usage) {
@@ -937,7 +948,7 @@ VkSwapchainCreateInfoKHR VkRenderFramework::GetDefaultSwapchainCreateInfo(VkSurf
     swapchain_ci.minImageCount = surface_info.surface_capabilities.minImageCount;
     swapchain_ci.imageFormat = surface_info.surface_formats[0].format;
     swapchain_ci.imageColorSpace = surface_info.surface_formats[0].colorSpace;
-    swapchain_ci.imageExtent = surface_info.surface_capabilities.minImageExtent;
+    swapchain_ci.imageExtent = GetSwapchainExtent(surface_info.surface_capabilities);
     swapchain_ci.imageArrayLayers = 1;
     swapchain_ci.imageUsage = image_usage;
     swapchain_ci.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE;
diff --git a/tests/framework/render.h b/tests/framework/render.h
@@ -108,6 +108,7 @@ class VkRenderFramework : public VkTestFramework {
     // Functions to create surfaces and swapchains that *aren't* member variables of VkRenderFramework
     VkResult CreateSurface(SurfaceContext &surface_context, vkt::Surface &surface, VkInstance custom_instance = VK_NULL_HANDLE);
     SurfaceInformation GetSwapchainInfo(const VkSurfaceKHR surface);
+    static VkExtent2D GetSwapchainExtent(const VkSurfaceCapabilitiesKHR& surface_caps);
     static VkSwapchainCreateInfoKHR GetDefaultSwapchainCreateInfo(
         VkSurfaceKHR surface, const SurfaceInformation &surface_info,
         VkImageUsageFlags image_usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT);
diff --git a/tests/icd/test_icd.cpp b/tests/icd/test_icd.cpp
@@ -1015,8 +1015,8 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceSurfaceCapabilitiesKHR(Vk
     // In general just say max supported is available for requested surface
     pSurfaceCapabilities->minImageCount = 1;
     pSurfaceCapabilities->maxImageCount = 0;
-    pSurfaceCapabilities->currentExtent.width = 0xFFFFFFFF;
-    pSurfaceCapabilities->currentExtent.height = 0xFFFFFFFF;
+    pSurfaceCapabilities->currentExtent.width = 64;
+    pSurfaceCapabilities->currentExtent.height = 64;
     pSurfaceCapabilities->minImageExtent.width = 1;
     pSurfaceCapabilities->minImageExtent.height = 1;
     pSurfaceCapabilities->maxImageExtent.width = 0xFFFF;
diff --git a/tests/unit/arm_best_practices.cpp b/tests/unit/arm_best_practices.cpp
@@ -469,7 +469,7 @@ TEST_F(VkArmBestPracticesLayerTest, PresentModeTest) {
     swapchain_create_info.minImageCount = m_surface_capabilities.minImageCount;
     swapchain_create_info.imageFormat = m_surface_formats[0].format;
     swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace;
-    swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent;
+    swapchain_create_info.imageExtent = GetSwapchainExtent(m_surface_capabilities);
     swapchain_create_info.imageArrayLayers = 1;
     swapchain_create_info.imageUsage = imageUsage;
     swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE;
diff --git a/tests/unit/best_practices.cpp b/tests/unit/best_practices.cpp
@@ -637,7 +637,7 @@ TEST_F(VkBestPracticesLayerTest, TripleBufferingTest) {
     swapchain_create_info.minImageCount = 2;
     swapchain_create_info.imageFormat = m_surface_formats[0].format;
     swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace;
-    swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent;
+    swapchain_create_info.imageExtent = GetSwapchainExtent(m_surface_capabilities);
     swapchain_create_info.imageArrayLayers = 1;
     swapchain_create_info.imageUsage = imageUsage;
     swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE;
@@ -703,7 +703,7 @@ TEST_F(VkBestPracticesLayerTest, SwapchainCreationTest) {
 
     swapchain_create_info.imageFormat = m_surface_formats[0].format;
     swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace;
-    swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent;
+    swapchain_create_info.imageExtent = GetSwapchainExtent(m_surface_capabilities);
 
     // GetPhysicalDeviceSurfacePresentModesKHR() not called before trying to create a swapchain
     m_errorMonitor->SetDesiredWarning("BestPractices-vkCreateSwapchainKHR-present-mode-no-surface");
diff --git a/tests/unit/best_practices_positive.cpp b/tests/unit/best_practices_positive.cpp
@@ -396,7 +396,7 @@ TEST_F(VkPositiveBestPracticesLayerTest, CreateFifoRelaxedSwapchain) {
     swapchain_create_info.minImageCount = 2;
     swapchain_create_info.imageFormat = m_surface_formats[0].format;
     swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace;
-    swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent;
+    swapchain_create_info.imageExtent = GetSwapchainExtent(m_surface_capabilities);
     swapchain_create_info.imageArrayLayers = 1;
     swapchain_create_info.imageUsage = imageUsage;
     swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE;
diff --git a/tests/unit/debug_extensions.cpp b/tests/unit/debug_extensions.cpp
@@ -538,7 +538,7 @@ TEST_F(NegativeDebugExtensions, SwapchainImagesDebugMarker) {
     swapchain_create_info.minImageCount = info.surface_capabilities.minImageCount;
     swapchain_create_info.imageFormat = info.surface_formats[0].format;
     swapchain_create_info.imageColorSpace = info.surface_formats[0].colorSpace;
-    swapchain_create_info.imageExtent = info.surface_capabilities.minImageExtent;
+    swapchain_create_info.imageExtent = GetSwapchainExtent(info.surface_capabilities);
     swapchain_create_info.imageArrayLayers = 1;
     swapchain_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
     swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE;
diff --git a/tests/unit/debug_extensions_positive.cpp b/tests/unit/debug_extensions_positive.cpp
@@ -170,7 +170,7 @@ TEST_F(PositiveDebugExtensions, SwapchainImagesDebugMarker) {
     swapchain_create_info.minImageCount = info.surface_capabilities.minImageCount;
     swapchain_create_info.imageFormat = info.surface_formats[0].format;
     swapchain_create_info.imageColorSpace = info.surface_formats[0].colorSpace;
-    swapchain_create_info.imageExtent = info.surface_capabilities.minImageExtent;
+    swapchain_create_info.imageExtent = GetSwapchainExtent(info.surface_capabilities);
     swapchain_create_info.imageArrayLayers = 1;
     swapchain_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
     swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE;
diff --git a/tests/unit/image_layout_positive.cpp b/tests/unit/image_layout_positive.cpp
@@ -110,8 +110,8 @@ TEST_F(PositiveImageLayout, ImagelessTracking) {
     RETURN_IF_SKIP(InitState(nullptr, &create_device_pnext));
     RETURN_IF_SKIP(InitSwapchain(VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT));
 
-    uint32_t attachmentWidth = m_surface_capabilities.minImageExtent.width;
-    uint32_t attachmentHeight = m_surface_capabilities.minImageExtent.height;
+    uint32_t attachmentWidth = GetSwapchainExtent(m_surface_capabilities).width;
+    uint32_t attachmentHeight = GetSwapchainExtent(m_surface_capabilities).height;
     VkFormat attachmentFormat = m_surface_formats[0].format;
 
     RenderPassSingleSubpass rp(*this);
diff --git a/tests/unit/parent.cpp b/tests/unit/parent.cpp
@@ -340,7 +340,7 @@ TEST_F(NegativeParent, Instance_Surface) {
     swapchain_ci.minImageCount = m_surface_capabilities.minImageCount;
     swapchain_ci.imageFormat = m_surface_formats[0].format;
     swapchain_ci.imageColorSpace = m_surface_formats[0].colorSpace;
-    swapchain_ci.imageExtent = m_surface_capabilities.minImageExtent;
+    swapchain_ci.imageExtent = GetSwapchainExtent(m_surface_capabilities);
     swapchain_ci.imageArrayLayers = 1;
     swapchain_ci.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
     swapchain_ci.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE;
@@ -387,7 +387,7 @@ TEST_F(NegativeParent, Device_OldSwapchain) {
     swapchain_ci.minImageCount = m_surface_capabilities.minImageCount;
     swapchain_ci.imageFormat = m_surface_formats[0].format;
     swapchain_ci.imageColorSpace = m_surface_formats[0].colorSpace;
-    swapchain_ci.imageExtent = m_surface_capabilities.minImageExtent;
+    swapchain_ci.imageExtent = GetSwapchainExtent(m_surface_capabilities);
     swapchain_ci.imageArrayLayers = 1;
     swapchain_ci.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
     swapchain_ci.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE;
diff --git a/tests/unit/sync_val_wsi_positive.cpp b/tests/unit/sync_val_wsi_positive.cpp
@@ -423,8 +423,8 @@ TEST_F(PositiveSyncValWsi, ResyncWithSwapchain) {
     transition_swapchain_image0.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1};
 
     const SurfaceInformation info = GetSwapchainInfo(m_surface);
-    const uint32_t width = info.surface_capabilities.minImageExtent.width;
-    const uint32_t height = info.surface_capabilities.minImageExtent.height;
+    const uint32_t width = GetSwapchainExtent(info.surface_capabilities).width;
+    const uint32_t height = GetSwapchainExtent(info.surface_capabilities).height;
     const uint32_t format_size = vkuFormatTexelBlockSize(info.surface_formats[0].format);
     vkt::Buffer buffer(*m_device, width * height * format_size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT);
 
@@ -536,8 +536,8 @@ TEST_F(PositiveSyncValWsi, ResyncWithSwapchain2) {
     transition_swapchain_image0.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1};
 
     const SurfaceInformation info = GetSwapchainInfo(m_surface);
-    const uint32_t width = info.surface_capabilities.minImageExtent.width;
-    const uint32_t height = info.surface_capabilities.minImageExtent.height;
+    const uint32_t width = GetSwapchainExtent(info.surface_capabilities).width;
+    const uint32_t height = GetSwapchainExtent(info.surface_capabilities).height;
     const uint32_t format_size = vkuFormatTexelBlockSize(info.surface_formats[0].format);
     vkt::Buffer buffer(*m_device, width * height * format_size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT);
 
@@ -625,8 +625,8 @@ TEST_F(PositiveSyncValWsi, ResyncWithSwapchain3) {
     transition_swapchain_image0.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1};
 
     const SurfaceInformation info = GetSwapchainInfo(m_surface);
-    const uint32_t width = info.surface_capabilities.minImageExtent.width;
-    const uint32_t height = info.surface_capabilities.minImageExtent.height;
+    const uint32_t width = GetSwapchainExtent(info.surface_capabilities).width;
+    const uint32_t height = GetSwapchainExtent(info.surface_capabilities).height;
     const uint32_t format_size = vkuFormatTexelBlockSize(info.surface_formats[0].format);
     vkt::Buffer buffer(*m_device, width * height * format_size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT);
 
@@ -726,8 +726,8 @@ TEST_F(PositiveSyncValWsi, ResyncWithSwapchain4) {
     transition_swapchain_image.image = swapchain_image0;
     transition_swapchain_image.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1};
 
-    const uint32_t width = surface_info.surface_capabilities.minImageExtent.width;
-    const uint32_t height = surface_info.surface_capabilities.minImageExtent.height;
+    const uint32_t width = GetSwapchainExtent(surface_info.surface_capabilities).width;
+    const uint32_t height = GetSwapchainExtent(surface_info.surface_capabilities).height;
     const uint32_t format_size = vkuFormatTexelBlockSize(surface_info.surface_formats[0].format);
     vkt::Buffer buffer(*m_device, width * height * format_size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT);
 
@@ -923,8 +923,8 @@ TEST_F(PositiveSyncValWsi, BindSwapchainImage) {
     image_ci.pNext = &image_swapchain_ci;
     image_ci.imageType = VK_IMAGE_TYPE_2D;
     image_ci.format = m_surface_formats[0].format;
-    image_ci.extent.width = m_surface_capabilities.minImageExtent.width;
-    image_ci.extent.height = m_surface_capabilities.minImageExtent.height;
+    image_ci.extent.width = GetSwapchainExtent(m_surface_capabilities).width;
+    image_ci.extent.height = GetSwapchainExtent(m_surface_capabilities).height;
     image_ci.extent.depth = 1;
     image_ci.mipLevels = 1;
     image_ci.arrayLayers = 1;
@@ -993,8 +993,8 @@ TEST_F(PositiveSyncValWsi, BindSwapchainImage2) {
     image_ci.pNext = &image_swapchain_ci;
     image_ci.imageType = VK_IMAGE_TYPE_2D;
     image_ci.format = m_surface_formats[0].format;
-    image_ci.extent.width = m_surface_capabilities.minImageExtent.width;
-    image_ci.extent.height = m_surface_capabilities.minImageExtent.height;
+    image_ci.extent.width = GetSwapchainExtent(m_surface_capabilities).width;
+    image_ci.extent.height = GetSwapchainExtent(m_surface_capabilities).height;
     image_ci.extent.depth = 1;
     image_ci.mipLevels = 1;
     image_ci.arrayLayers = 1;
diff --git a/tests/unit/wsi.cpp b/tests/unit/wsi.cpp
diff --git a/tests/unit/wsi_positive.cpp b/tests/unit/wsi_positive.cpp
