From 39b3005ba560da72e2c71cab9c793af2c2bed511 Mon Sep 17 00:00:00 2001 From: Shannon McPherson Date: Wed, 20 Nov 2019 14:53:01 -0700 Subject: build: Update known good for 1.1.128 Vulkan header Changes: - Updated known good files - Generated new files using `generate_source.py` Updated: - `build-android/vulkan-headers_revision_android` - `icd/generated/mock_icd.cpp` - `icd/generated/mock_icd.h` - `icd/generated/vk_typemap_helper.h` - `scripts/known_good.json` - `vulkaninfo/generated/vulkaninfo.hpp` Change-Id: I03c9daed1137f5ee2ac0a553970de55ad592dc69 --- icd/generated/mock_icd.cpp | 34 +++++++++++++++++++++ icd/generated/mock_icd.h | 25 ++++++++++++++++ icd/generated/vk_typemap_helper.h | 63 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+) (limited to 'icd/generated') diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp index f54bb3a5..5155f50c 100644 --- a/icd/generated/mock_icd.cpp +++ b/icd/generated/mock_icd.cpp @@ -2701,6 +2701,40 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetFenceFdKHR( } +static VKAPI_ATTR VkResult VKAPI_CALL EnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR( + VkPhysicalDevice physicalDevice, + uint32_t queueFamilyIndex, + uint32_t* pCounterCount, + VkPerformanceCounterKHR* pCounters, + VkPerformanceCounterDescriptionKHR* pCounterDescriptions) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} + +static VKAPI_ATTR void VKAPI_CALL GetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR( + VkPhysicalDevice physicalDevice, + const VkQueryPoolPerformanceCreateInfoKHR* pPerformanceQueryCreateInfo, + uint32_t* pNumPasses) +{ +//Not a CREATE or DESTROY function +} + +static VKAPI_ATTR VkResult VKAPI_CALL AcquireProfilingLockKHR( + VkDevice device, + const VkAcquireProfilingLockInfoKHR* pInfo) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} + +static VKAPI_ATTR void VKAPI_CALL ReleaseProfilingLockKHR( + VkDevice device) +{ +//Not a CREATE or DESTROY function +} + + static VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceSurfaceCapabilities2KHR( VkPhysicalDevice physicalDevice, diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h index 7c9cc896..d4e38148 100644 --- a/icd/generated/mock_icd.h +++ b/icd/generated/mock_icd.h @@ -150,6 +150,7 @@ static const std::unordered_map device_extension_map = { {"VK_KHR_external_fence", 1}, {"VK_KHR_external_fence_win32", 1}, {"VK_KHR_external_fence_fd", 1}, + {"VK_KHR_performance_query", 1}, {"VK_KHR_maintenance2", 1}, {"VK_KHR_variable_pointers", 1}, {"VK_EXT_external_memory_dma_buf", 1}, @@ -1612,6 +1613,26 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetFenceFdKHR( int* pFd); +static VKAPI_ATTR VkResult VKAPI_CALL EnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR( + VkPhysicalDevice physicalDevice, + uint32_t queueFamilyIndex, + uint32_t* pCounterCount, + VkPerformanceCounterKHR* pCounters, + VkPerformanceCounterDescriptionKHR* pCounterDescriptions); + +static VKAPI_ATTR void VKAPI_CALL GetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR( + VkPhysicalDevice physicalDevice, + const VkQueryPoolPerformanceCreateInfoKHR* pPerformanceQueryCreateInfo, + uint32_t* pNumPasses); + +static VKAPI_ATTR VkResult VKAPI_CALL AcquireProfilingLockKHR( + VkDevice device, + const VkAcquireProfilingLockInfoKHR* pInfo); + +static VKAPI_ATTR void VKAPI_CALL ReleaseProfilingLockKHR( + VkDevice device); + + static VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceSurfaceCapabilities2KHR( VkPhysicalDevice physicalDevice, @@ -2826,6 +2847,10 @@ static const std::unordered_map name_to_funcptr_map = { #endif {"vkImportFenceFdKHR", (void*)ImportFenceFdKHR}, {"vkGetFenceFdKHR", (void*)GetFenceFdKHR}, + {"vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR", (void*)EnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR}, + {"vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR", (void*)GetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR}, + {"vkAcquireProfilingLockKHR", (void*)AcquireProfilingLockKHR}, + {"vkReleaseProfilingLockKHR", (void*)ReleaseProfilingLockKHR}, {"vkGetPhysicalDeviceSurfaceCapabilities2KHR", (void*)GetPhysicalDeviceSurfaceCapabilities2KHR}, {"vkGetPhysicalDeviceSurfaceFormats2KHR", (void*)GetPhysicalDeviceSurfaceFormats2KHR}, {"vkGetPhysicalDeviceDisplayProperties2KHR", (void*)GetPhysicalDeviceDisplayProperties2KHR}, diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index 4d495fe8..cb718c80 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -1531,6 +1531,69 @@ template <> struct LvlSTypeMap { typedef VkFenceGetFdInfoKHR Type; }; +// Map type VkPhysicalDevicePerformanceQueryFeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_QUERY_FEATURES_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_QUERY_FEATURES_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDevicePerformanceQueryFeaturesKHR Type; +}; + +// Map type VkPhysicalDevicePerformanceQueryPropertiesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_QUERY_PROPERTIES_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_QUERY_PROPERTIES_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDevicePerformanceQueryPropertiesKHR Type; +}; + +// Map type VkPerformanceCounterKHR to id VK_STRUCTURE_TYPE_PERFORMANCE_COUNTER_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PERFORMANCE_COUNTER_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkPerformanceCounterKHR Type; +}; + +// Map type VkPerformanceCounterDescriptionKHR to id VK_STRUCTURE_TYPE_PERFORMANCE_COUNTER_DESCRIPTION_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PERFORMANCE_COUNTER_DESCRIPTION_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkPerformanceCounterDescriptionKHR Type; +}; + +// Map type VkQueryPoolPerformanceCreateInfoKHR to id VK_STRUCTURE_TYPE_QUERY_POOL_PERFORMANCE_CREATE_INFO_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_QUERY_POOL_PERFORMANCE_CREATE_INFO_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkQueryPoolPerformanceCreateInfoKHR Type; +}; + +// Map type VkAcquireProfilingLockInfoKHR to id VK_STRUCTURE_TYPE_ACQUIRE_PROFILING_LOCK_INFO_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_ACQUIRE_PROFILING_LOCK_INFO_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkAcquireProfilingLockInfoKHR Type; +}; + +// Map type VkPerformanceQuerySubmitInfoKHR to id VK_STRUCTURE_TYPE_PERFORMANCE_QUERY_SUBMIT_INFO_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PERFORMANCE_QUERY_SUBMIT_INFO_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkPerformanceQuerySubmitInfoKHR Type; +}; + // Map type VkPhysicalDeviceSurfaceInfo2KHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SURFACE_INFO_2_KHR template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SURFACE_INFO_2_KHR; -- cgit v1.2.3