From 119e7c3bbae122f6cc5d778d068fb91e0e85d6a9 Mon Sep 17 00:00:00 2001 From: Shannon McPherson Date: Tue, 15 Oct 2019 11:45:18 -0600 Subject: build: Update known good for 1.1.124 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: Ib6c35389471d8cbdaa60608f76e563ad50271a53 --- icd/generated/mock_icd.cpp | 28 +++++++++++++++++ icd/generated/mock_icd.h | 21 +++++++++++++ icd/generated/vk_typemap_helper.h | 63 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 112 insertions(+) (limited to 'icd/generated') diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp index a32d1195..b5946a4c 100644 --- a/icd/generated/mock_icd.cpp +++ b/icd/generated/mock_icd.cpp @@ -2889,6 +2889,34 @@ static VKAPI_ATTR void VKAPI_CALL CmdDrawIndexedIndirectCountKHR( +static VKAPI_ATTR VkResult VKAPI_CALL GetSemaphoreCounterValueKHR( + VkDevice device, + VkSemaphore semaphore, + uint64_t* pValue) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} + +static VKAPI_ATTR VkResult VKAPI_CALL WaitSemaphoresKHR( + VkDevice device, + const VkSemaphoreWaitInfoKHR* pWaitInfo, + uint64_t timeout) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} + +static VKAPI_ATTR VkResult VKAPI_CALL SignalSemaphoreKHR( + VkDevice device, + const VkSemaphoreSignalInfoKHR* pSignalInfo) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} + + + static VKAPI_ATTR VkResult VKAPI_CALL GetPipelineExecutablePropertiesKHR( diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h index 3863e839..80b659b0 100644 --- a/icd/generated/mock_icd.h +++ b/icd/generated/mock_icd.h @@ -190,6 +190,7 @@ static const std::unordered_map device_extension_map = { {"VK_EXT_external_memory_host", 1}, {"VK_AMD_buffer_marker", 1}, {"VK_KHR_shader_atomic_int64", 1}, + {"VK_KHR_shader_clock", 1}, {"VK_AMD_pipeline_compiler_control", 1}, {"VK_EXT_calibrated_timestamps", 1}, {"VK_AMD_shader_core_properties", 2}, @@ -208,6 +209,7 @@ static const std::unordered_map device_extension_map = { {"VK_NV_shader_image_footprint", 2}, {"VK_NV_scissor_exclusive", 1}, {"VK_NV_device_diagnostic_checkpoints", 2}, + {"VK_KHR_timeline_semaphore", 2}, {"VK_INTEL_shader_integer_functions2", 1}, {"VK_INTEL_performance_query", 1}, {"VK_KHR_vulkan_memory_model", 3}, @@ -1721,6 +1723,22 @@ static VKAPI_ATTR void VKAPI_CALL CmdDrawIndexedIndirectCountKHR( +static VKAPI_ATTR VkResult VKAPI_CALL GetSemaphoreCounterValueKHR( + VkDevice device, + VkSemaphore semaphore, + uint64_t* pValue); + +static VKAPI_ATTR VkResult VKAPI_CALL WaitSemaphoresKHR( + VkDevice device, + const VkSemaphoreWaitInfoKHR* pWaitInfo, + uint64_t timeout); + +static VKAPI_ATTR VkResult VKAPI_CALL SignalSemaphoreKHR( + VkDevice device, + const VkSemaphoreSignalInfoKHR* pSignalInfo); + + + static VKAPI_ATTR VkResult VKAPI_CALL GetPipelineExecutablePropertiesKHR( @@ -2820,6 +2838,9 @@ static const std::unordered_map name_to_funcptr_map = { {"vkGetDescriptorSetLayoutSupportKHR", (void*)GetDescriptorSetLayoutSupportKHR}, {"vkCmdDrawIndirectCountKHR", (void*)CmdDrawIndirectCountKHR}, {"vkCmdDrawIndexedIndirectCountKHR", (void*)CmdDrawIndexedIndirectCountKHR}, + {"vkGetSemaphoreCounterValueKHR", (void*)GetSemaphoreCounterValueKHR}, + {"vkWaitSemaphoresKHR", (void*)WaitSemaphoresKHR}, + {"vkSignalSemaphoreKHR", (void*)SignalSemaphoreKHR}, {"vkGetPipelineExecutablePropertiesKHR", (void*)GetPipelineExecutablePropertiesKHR}, {"vkGetPipelineExecutableStatisticsKHR", (void*)GetPipelineExecutableStatisticsKHR}, {"vkGetPipelineExecutableInternalRepresentationsKHR", (void*)GetPipelineExecutableInternalRepresentationsKHR}, diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index 20bc5344..f9ded7f1 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -1639,6 +1639,15 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CLOCK_FEATURES_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceShaderClockFeaturesKHR Type; +}; + // Map type VkPhysicalDeviceDriverPropertiesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR; @@ -1675,6 +1684,60 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceTimelineSemaphoreFeaturesKHR Type; +}; + +// Map type VkPhysicalDeviceTimelineSemaphorePropertiesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceTimelineSemaphorePropertiesKHR Type; +}; + +// Map type VkSemaphoreTypeCreateInfoKHR to id VK_STRUCTURE_TYPE_SEMAPHORE_TYPE_CREATE_INFO_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_SEMAPHORE_TYPE_CREATE_INFO_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkSemaphoreTypeCreateInfoKHR Type; +}; + +// Map type VkTimelineSemaphoreSubmitInfoKHR to id VK_STRUCTURE_TYPE_TIMELINE_SEMAPHORE_SUBMIT_INFO_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_TIMELINE_SEMAPHORE_SUBMIT_INFO_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkTimelineSemaphoreSubmitInfoKHR Type; +}; + +// Map type VkSemaphoreWaitInfoKHR to id VK_STRUCTURE_TYPE_SEMAPHORE_WAIT_INFO_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_SEMAPHORE_WAIT_INFO_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkSemaphoreWaitInfoKHR Type; +}; + +// Map type VkSemaphoreSignalInfoKHR to id VK_STRUCTURE_TYPE_SEMAPHORE_SIGNAL_INFO_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_SEMAPHORE_SIGNAL_INFO_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkSemaphoreSignalInfoKHR Type; +}; + // Map type VkPhysicalDeviceVulkanMemoryModelFeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES_KHR template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES_KHR; -- cgit v1.2.3