Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions loader/wsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -2207,12 +2207,6 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateSharedSwapchainsKHR(VkDevice dev
"[VUID-vkCreateSharedSwapchainsKHR-device-parameter]");
abort(); /* Intentionally fail so user can correct issue. */
}
if (NULL != icd_term->surface_list.list) {
loader_log(NULL, VULKAN_LOADER_ERROR_BIT, 0,
"vkCreateSharedSwapchainsKHR Terminator: No VkSurfaceKHR objects were created, indicating an application "
"bug. Returning VK_SUCCESS. ");
return VK_SUCCESS;
}
if (NULL == dev->loader_dispatch.extension_terminator_dispatch.CreateSharedSwapchainsKHR) {
loader_log(NULL, VULKAN_LOADER_ERROR_BIT, 0,
"vkCreateSharedSwapchainsKHR Terminator: Driver's function pointer was NULL, returning VK_SUCCESS. Was the "
Expand Down
5 changes: 4 additions & 1 deletion tests/loader_get_proc_addr_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,10 @@ TEST(GetDeviceProcAddr, SwapchainFuncsWithTerminator) {
infos[1].sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR;
infos[1].surface = surface2;

ASSERT_EQ(VK_SUCCESS, CreateSharedSwapchainsKHR(dev.dev, 2, infos.data(), nullptr, &swapchain));
std::array<VkSwapchainKHR, 2> swapchains{};
ASSERT_EQ(VK_SUCCESS, CreateSharedSwapchainsKHR(dev.dev, static_cast<uint32_t>(swapchains.size()), infos.data(), nullptr,
swapchains.data()));
ASSERT_FALSE(log.find("vkCreateSharedSwapchainsKHR Terminator: No VkSurfaceKHR objects were created"));
}
env.vulkan_functions.vkDestroySurfaceKHR(inst.inst, surface, nullptr);
env.vulkan_functions.vkDestroySurfaceKHR(inst.inst, surface2, nullptr);
Expand Down
Loading