From 8a630566844b7b76bd5c74555088064e4593ed2f Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Fri, 25 Nov 2016 13:17:36 +1300 Subject: layers: Move present modes tracking to CV Signed-off-by: Chris Forbes --- layers/swapchain.cpp | 107 --------------------------------------------------- 1 file changed, 107 deletions(-) (limited to 'layers/swapchain.cpp') diff --git a/layers/swapchain.cpp b/layers/swapchain.cpp index 6ae123aa..9f98be2b 100644 --- a/layers/swapchain.cpp +++ b/layers/swapchain.cpp @@ -192,7 +192,6 @@ VKAPI_ATTR void VKAPI_CALL DestroyInstance(VkInstance instance, const VkAllocati "VkDestroyInstance() called before all of its associated VkDevices were destroyed."); } free(pPhysicalDevice->pSurfaceFormats); - free(pPhysicalDevice->pPresentModes); } // Erase the SwpPhysicalDevice's from the my_data->physicalDeviceMap (which @@ -855,8 +854,6 @@ VKAPI_ATTR VkResult VKAPI_CALL EnumeratePhysicalDevices(VkInstance instance, uin my_data->physicalDeviceMap[pPhysicalDevices[i]].gotQueueFamilyPropertyCount = false; my_data->physicalDeviceMap[pPhysicalDevices[i]].surfaceFormatCount = 0; my_data->physicalDeviceMap[pPhysicalDevices[i]].pSurfaceFormats = NULL; - my_data->physicalDeviceMap[pPhysicalDevices[i]].presentModeCount = 0; - my_data->physicalDeviceMap[pPhysicalDevices[i]].pPresentModes = NULL; // Point to the associated SwpInstance: if (pInstance) { pInstance->physicalDevices[pPhysicalDevices[i]] = &my_data->physicalDeviceMap[pPhysicalDevices[i]]; @@ -1080,80 +1077,6 @@ VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevi return VK_ERROR_VALIDATION_FAILED_EXT; } -VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, - uint32_t *pPresentModeCount, - VkPresentModeKHR *pPresentModes) { - VkResult result = VK_SUCCESS; - bool skip_call = false; - layer_data *my_data = get_my_data_ptr(get_dispatch_key(physicalDevice), layer_data_map); - std::unique_lock lock(global_lock); - SwpPhysicalDevice *pPhysicalDevice = NULL; - { - auto it = my_data->physicalDeviceMap.find(physicalDevice); - pPhysicalDevice = (it == my_data->physicalDeviceMap.end()) ? NULL : &it->second; - } - - if (pPhysicalDevice && pPresentModes) { - // Compare the preliminary value of *pPresentModeCount with the value this time: - if (pPhysicalDevice->presentModeCount == 0) { - // Since we haven't recorded a preliminary value of *pPresentModeCount, that likely means that the application didn't - // previously call this function with a NULL value of pPresentModes: - skip_call |= log_msg( - my_data->report_data, VK_DEBUG_REPORT_WARNING_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_PHYSICAL_DEVICE_EXT, - reinterpret_cast(pPhysicalDevice->physicalDevice), __LINE__, SWAPCHAIN_PRIOR_COUNT, swapchain_layer_name, - "vkGetPhysicalDeviceSurfacePresentModesKHR() called with non-NULL pPresentModeCount; but no prior positive " - "value has been seen for pPresentModes."); - } else if (*pPresentModeCount > pPhysicalDevice->presentModeCount) { - skip_call |= log_msg( - my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_PHYSICAL_DEVICE_EXT, - reinterpret_cast(pPhysicalDevice->physicalDevice), __LINE__, SWAPCHAIN_INVALID_COUNT, - swapchain_layer_name, - "vkGetPhysicalDeviceSurfacePresentModesKHR() called with non-NULL pPresentModeCount, and with pPresentModes set to " - "a value (%d) that is greater than the value (%d) that was returned when pPresentModeCount was NULL.", - *pPresentModeCount, pPhysicalDevice->presentModeCount); - } - } - lock.unlock(); - - if (!skip_call) { - // Call down the call chain: - result = my_data->instance_dispatch_table->GetPhysicalDeviceSurfacePresentModesKHR(physicalDevice, surface, - pPresentModeCount, pPresentModes); - lock.lock(); - - // Obtain this pointer again after locking: - { - auto it = my_data->physicalDeviceMap.find(physicalDevice); - pPhysicalDevice = (it == my_data->physicalDeviceMap.end()) ? NULL : &it->second; - } - if ((result == VK_SUCCESS) && pPhysicalDevice && !pPresentModes && pPresentModeCount) { - // Record the result of this preliminary query: - pPhysicalDevice->presentModeCount = *pPresentModeCount; - } else if (((result == VK_SUCCESS) || (result == VK_INCOMPLETE)) && pPhysicalDevice && - pPresentModes && pPresentModeCount && (*pPresentModeCount > 0)) { - // Record the result of this query: - - // Note: for poorly-written applications (e.g. that don't call this command - // twice, the first time with pPresentModes set to NULL, and the second time - // with a non-NULL pPresentModes and with the same count as returned the - // first time), record again the count when pPresentModes is non-NULL: - pPhysicalDevice->presentModeCount = *pPresentModeCount; - pPhysicalDevice->pPresentModes = (VkPresentModeKHR *)malloc(*pPresentModeCount * sizeof(VkPresentModeKHR)); - if (pPhysicalDevice->pPresentModes) { - for (uint32_t i = 0; i < *pPresentModeCount; i++) { - pPhysicalDevice->pPresentModes[i] = pPresentModes[i]; - } - } else { - pPhysicalDevice->presentModeCount = 0; - } - } - lock.unlock(); - - return result; - } - return VK_ERROR_VALIDATION_FAILED_EXT; -} - // This function does the up-front validation work for vkCreateSwapchainKHR(), // and returns true if a logging callback indicates that the call down the // chain should be skipped: @@ -1251,34 +1174,6 @@ static bool validateCreateSwapchainKHR(VkDevice device, const VkSwapchainCreateI } } - // Validate pCreateInfo values with the results of - // vkGetPhysicalDeviceSurfacePresentModesKHR(): - if (!pPhysicalDevice || !pPhysicalDevice->presentModeCount) { - if (!pCreateInfo || (pCreateInfo->presentMode != VK_PRESENT_MODE_FIFO_KHR)) { - skip_call |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, - reinterpret_cast(device), __LINE__, SWAPCHAIN_CREATE_SWAP_WITHOUT_QUERY, - swapchain_layer_name, "vkCreateSwapchainKHR() called before calling " - "vkGetPhysicalDeviceSurfacePresentModesKHR()."); - } - } else if (pCreateInfo) { - // Validate pCreateInfo->presentMode against - // vkGetPhysicalDeviceSurfacePresentModesKHR(): - bool foundMatch = false; - for (uint32_t i = 0; i < pPhysicalDevice->presentModeCount; i++) { - if (pPhysicalDevice->pPresentModes[i] == pCreateInfo->presentMode) { - foundMatch = true; - break; - } - } - if (!foundMatch) { - skip_call |= - log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, - reinterpret_cast(device), __LINE__, SWAPCHAIN_CREATE_SWAP_BAD_PRESENT_MODE, swapchain_layer_name, - "vkCreateSwapchainKHR() called with a non-supported pCreateInfo->presentMode (i.e. %s).", - presentModeStr(pCreateInfo->presentMode)); - } - } - // Validate pCreateInfo->imageSharingMode and related values: if (pCreateInfo->imageSharingMode == VK_SHARING_MODE_CONCURRENT) { if ((pCreateInfo->queueFamilyIndexCount <= 1) || !pCreateInfo->pQueueFamilyIndices) { @@ -1629,8 +1524,6 @@ static PFN_vkVoidFunction intercept_khr_surface_command(const char *name, VkInst {"vkDestroySurfaceKHR", reinterpret_cast(DestroySurfaceKHR)}, {"vkGetPhysicalDeviceSurfaceSupportKHR", reinterpret_cast(GetPhysicalDeviceSurfaceSupportKHR)}, {"vkGetPhysicalDeviceSurfaceFormatsKHR", reinterpret_cast(GetPhysicalDeviceSurfaceFormatsKHR)}, - {"vkGetPhysicalDeviceSurfacePresentModesKHR", - reinterpret_cast(GetPhysicalDeviceSurfacePresentModesKHR)}, {"vkGetPhysicalDeviceDisplayPlanePropertiesKHR", reinterpret_cast(GetPhysicalDeviceDisplayPlanePropertiesKHR)}, {"vkGetDisplayPlaneSupportedDisplaysKHR", reinterpret_cast(GetDisplayPlaneSupportedDisplaysKHR)}, -- cgit v1.2.3