diff options
| author | Ian Elliott <ianelliott@google.com> | 2016-01-05 13:06:48 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2016-01-06 12:23:09 -0700 |
| commit | 11f825744523e146104c08bbc6e0f817f23318ee (patch) | |
| tree | 1b75c01c05365902d2bfe9de13a3d0adac57d015 /layers/swapchain.cpp | |
| parent | a59fd8a9d5fb02723f96d9760b4639abc7913ecc (diff) | |
| download | usermoji-11f825744523e146104c08bbc6e0f817f23318ee.tar.xz | |
Swapchain: No longer validate VkSwapchainKHR (object_track will do) ...
Actually, leave one VkSwapchainKHR check in. This is checking the
pCreateInfo->oldSwapchain value, which I'm not sure object_track will look
for). Can remove this later, if object_track does check this.
Diffstat (limited to 'layers/swapchain.cpp')
| -rw-r--r-- | layers/swapchain.cpp | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/layers/swapchain.cpp b/layers/swapchain.cpp index 70a18cf8..07434224 100644 --- a/layers/swapchain.cpp +++ b/layers/swapchain.cpp @@ -1453,6 +1453,7 @@ static VkBool32 validateCreateSwapchainKHR( fn); } } else { + // TBD: Leave this in (not sure object_track will check this)? skipCall |= LOG_ERROR_NON_VALID_OBJ(VK_DEBUG_REPORT_OBJECT_TYPE_SWAPCHAIN_KHR_EXT, pCreateInfo->oldSwapchain, "VkSwapchainKHR"); @@ -1531,10 +1532,6 @@ VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroySwapchainKHR( pSwapchain->images.clear(); } my_data->swapchainMap.erase(swapchain); - } else { - skipCall |= LOG_ERROR_NON_VALID_OBJ(VK_DEBUG_REPORT_OBJECT_TYPE_SWAPCHAIN_KHR_EXT, - swapchain, - "VkSwapchainKHR"); } if (VK_FALSE == skipCall) { @@ -1562,11 +1559,6 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainImagesKHR( __FUNCTION__, VK_KHR_SWAPCHAIN_EXTENSION_NAME); } SwpSwapchain *pSwapchain = &my_data->swapchainMap[swapchain]; - if (!pSwapchain) { - skipCall |= LOG_ERROR_NON_VALID_OBJ(VK_DEBUG_REPORT_OBJECT_TYPE_SWAPCHAIN_KHR_EXT, - swapchain.handle, - "VkSwapchainKHR"); - } if (!pSwapchainImageCount) { skipCall |= LOG_ERROR_NULL_POINTER(VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, device, @@ -1638,13 +1630,8 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkAcquireNextImageKHR( "%s() called even though the %s extension was not enabled for this VkDevice.", __FUNCTION__, VK_KHR_SWAPCHAIN_EXTENSION_NAME); } - // Validate that a valid VkSwapchainKHR was used: SwpSwapchain *pSwapchain = &my_data->swapchainMap[swapchain]; - if (!pSwapchain) { - skipCall |= LOG_ERROR_NON_VALID_OBJ(VK_DEBUG_REPORT_OBJECT_TYPE_SWAPCHAIN_KHR_EXT, - swapchain, - "VkSwapchainKHR"); - } else { + if (pSwapchain) { // Look to see if the application is trying to own too many images at // the same time (i.e. not leave any to display): uint32_t imagesOwnedByApp = 0; @@ -1788,10 +1775,6 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkQueuePresentKHR( __FUNCTION__, index); } } - } else { - skipCall |= LOG_ERROR_NON_VALID_OBJ(VK_DEBUG_REPORT_OBJECT_TYPE_SWAPCHAIN_KHR_EXT, - pPresentInfo->pSwapchains[i], - "VkSwapchainKHR"); } } |