From a6449dd2ce7ba5660aed30a675555b84323f03db Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Tue, 14 Mar 2017 10:31:48 -0600 Subject: layers: Remove deprecated KHX extension from OT/PV Deleted references to GetPhysicalDeviceImageFormateProperties2KHX and GetPhysicalDeviceProperties2KHX from object_tracker and parameter_validation. Change-Id: I83e29bae8302dad6f774886d8472451220b426d2 --- layers/object_tracker.cpp | 35 ----------------------------------- 1 file changed, 35 deletions(-) (limited to 'layers/object_tracker.cpp') diff --git a/layers/object_tracker.cpp b/layers/object_tracker.cpp index 113288d1..62d9e044 100644 --- a/layers/object_tracker.cpp +++ b/layers/object_tracker.cpp @@ -4498,38 +4498,6 @@ VKAPI_ATTR void VKAPI_CALL GetPhysicalDeviceExternalBufferPropertiesKHX( } } -VKAPI_ATTR void VKAPI_CALL GetPhysicalDeviceProperties2KHX(VkPhysicalDevice physicalDevice, - VkPhysicalDeviceProperties2KHX *pProperties) { - bool skip = false; - { - std::unique_lock lock(global_lock); - skip |= ValidateObject(physicalDevice, physicalDevice, VK_DEBUG_REPORT_OBJECT_TYPE_PHYSICAL_DEVICE_EXT, false, - VALIDATION_ERROR_UNDEFINED, VALIDATION_ERROR_UNDEFINED); - } - if (!skip) { - get_dispatch_table(ot_instance_table_map, physicalDevice)->GetPhysicalDeviceProperties2KHX(physicalDevice, pProperties); - } -} - -VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceImageFormatProperties2KHX( - VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2KHX *pImageFormatInfo, - VkImageFormatProperties2KHX *pImageFormatProperties) { - VkResult result = VK_ERROR_VALIDATION_FAILED_EXT; - bool skip = false; - { - std::unique_lock lock(global_lock); - skip |= ValidateObject(physicalDevice, physicalDevice, VK_DEBUG_REPORT_OBJECT_TYPE_PHYSICAL_DEVICE_EXT, false, - VALIDATION_ERROR_UNDEFINED, VALIDATION_ERROR_UNDEFINED); - } - if (skip) { - return VK_ERROR_VALIDATION_FAILED_EXT; - } - result = get_dispatch_table(ot_instance_table_map, physicalDevice) - ->GetPhysicalDeviceImageFormatProperties2KHX(physicalDevice, pImageFormatInfo, pImageFormatProperties); - - return result; -} - // VK_KHX_external_memory_fd Extension VKAPI_ATTR VkResult VKAPI_CALL GetMemoryFdKHX(VkDevice device, VkDeviceMemory memory, VkExternalMemoryHandleTypeFlagBitsKHX handleType, int *pFd) { @@ -5364,9 +5332,6 @@ static inline PFN_vkVoidFunction InterceptInstanceExtensionCommand(const char *n // VK_KHX_external_memory_capabilities Extension if (!strcmp(name, "GetPhysicalDeviceExternalBufferPropertiesKHX")) return (PFN_vkVoidFunction)GetPhysicalDeviceExternalBufferPropertiesKHX; - if (!strcmp(name, "GetPhysicalDeviceProperties2KHX")) return (PFN_vkVoidFunction)GetPhysicalDeviceProperties2KHX; - if (!strcmp(name, "GetPhysicalDeviceImageFormatProperties2KHX")) - return (PFN_vkVoidFunction)GetPhysicalDeviceImageFormatProperties2KHX; // VK_KHX_external_semaphore_capabilities Extension if (!strcmp(name, "GetPhysicalDeviceExternalSemaphorePropertiesKHX")) return (PFN_vkVoidFunction)GetPhysicalDeviceExternalSemaphorePropertiesKHX; -- cgit v1.2.3