From 6502083556be7037f3c32bcef88187c34472f990 Mon Sep 17 00:00:00 2001 From: Aliya Pazylbekova Date: Tue, 26 Mar 2019 10:49:47 -0400 Subject: [PATCH] Change present info pNext RDC warn and assert - Add VK_STRUCTURE_TYPE_PRESENT_FRAME_TOKEN_GGP as a pNext to ignore for VkPresentInfoKHR - Remove RDCASSERT for pPresentInfo->pNext to be null, since it can be not null, and there is a loop above the assert that checks the pNext term. --- renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp index 86a415b4b..dd34baeae 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp @@ -653,6 +653,7 @@ VkResult WrappedVulkan::vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR // allowed (and ignored) pNext structs if(next->sType != VK_STRUCTURE_TYPE_DISPLAY_PRESENT_INFO_KHR && next->sType != VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_INFO_KHR && + next->sType != VK_STRUCTURE_TYPE_PRESENT_FRAME_TOKEN_GGP && next->sType != VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR) { RDCWARN("Unsupported pNext structure in pPresentInfo: %s", ToStr(next->sType).c_str()); @@ -660,7 +661,6 @@ VkResult WrappedVulkan::vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR next = next->pNext; } - RDCASSERT(pPresentInfo->pNext == NULL); // TODO support multiple swapchains here VkResourceRecord *swaprecord = GetRecord(pPresentInfo->pSwapchains[0]);