From 697cc6c387fd3019c37a01d6d18309916d1cc44d Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Tue, 6 Jul 2021 13:22:55 -0700 Subject: build: Update to header 1.2.184 - Update known-good - Generate source Change-Id: I6f8219e31038b0efe1e141147292d041655dd640 --- build-android/vulkan-headers_revision_android | 2 +- common/vulkan_wrapper.cpp | 3 ++- icd/generated/mock_icd.cpp | 10 ++++++++++ icd/generated/mock_icd.h | 10 +++++++++- icd/generated/vk_typemap_helper.h | 18 ++++++++++++++++++ scripts/generate_vulkan_wrapper.py | 9 +++++++-- scripts/known_good.json | 4 ++-- vulkaninfo/generated/vulkaninfo.hpp | 1 + 8 files changed, 50 insertions(+), 7 deletions(-) diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android index 4a01df92..183cdbe4 100644 --- a/build-android/vulkan-headers_revision_android +++ b/build-android/vulkan-headers_revision_android @@ -1 +1 @@ -v1.2.183 +v1.2.184 diff --git a/common/vulkan_wrapper.cpp b/common/vulkan_wrapper.cpp index ffdb3f1e..2d1a05eb 100644 --- a/common/vulkan_wrapper.cpp +++ b/common/vulkan_wrapper.cpp @@ -944,8 +944,9 @@ PFN_vkCmdSetFragmentShadingRateEnumNV vkCmdSetFragmentShadingRateEnumNV; PFN_vkAcquireWinrtDisplayNV vkAcquireWinrtDisplayNV; PFN_vkGetWinrtDisplayNV vkGetWinrtDisplayNV; PFN_vkCmdSetVertexInputEXT vkCmdSetVertexInputEXT; -PFN_vkGetSubpassShadingMaxWorkgroupSizeHUAWEI vkGetSubpassShadingMaxWorkgroupSizeHUAWEI; +PFN_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI; PFN_vkCmdSubpassShadingHUAWEI vkCmdSubpassShadingHUAWEI; +PFN_vkGetMemoryRemoteAddressNV vkGetMemoryRemoteAddressNV; PFN_vkCmdSetPatchControlPointsEXT vkCmdSetPatchControlPointsEXT; PFN_vkCmdSetRasterizerDiscardEnableEXT vkCmdSetRasterizerDiscardEnableEXT; PFN_vkCmdSetDepthBiasEnableEXT vkCmdSetDepthBiasEnableEXT; diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp index 8f4cc841..0b65a419 100644 --- a/icd/generated/mock_icd.cpp +++ b/icd/generated/mock_icd.cpp @@ -5084,6 +5084,16 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetSemaphoreZirconHandleFUCHSIA( #endif /* VK_USE_PLATFORM_FUCHSIA */ +static VKAPI_ATTR VkResult VKAPI_CALL GetMemoryRemoteAddressNV( + VkDevice device, + const VkMemoryGetRemoteAddressInfoNV* getMemoryRemoteAddressInfo, + VkRemoteAddressNV* pAddress) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} + + static VKAPI_ATTR void VKAPI_CALL CmdSetPatchControlPointsEXT( VkCommandBuffer commandBuffer, uint32_t patchControlPoints) diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h index dea7ae69..c7ce1ee3 100644 --- a/icd/generated/mock_icd.h +++ b/icd/generated/mock_icd.h @@ -295,7 +295,8 @@ static const std::unordered_map device_extension_map = { {"VK_EXT_physical_device_drm", 1}, {"VK_FUCHSIA_external_memory", 1}, {"VK_FUCHSIA_external_semaphore", 1}, - {"VK_HUAWEI_subpass_shading", 0}, + {"VK_HUAWEI_subpass_shading", 2}, + {"VK_NV_external_memory_rdma", 1}, {"VK_EXT_extended_dynamic_state2", 1}, {"VK_EXT_color_write_enable", 1}, {"VK_EXT_global_priority_query", 1}, @@ -3137,6 +3138,12 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetSemaphoreZirconHandleFUCHSIA( #endif /* VK_USE_PLATFORM_FUCHSIA */ +static VKAPI_ATTR VkResult VKAPI_CALL GetMemoryRemoteAddressNV( + VkDevice device, + const VkMemoryGetRemoteAddressInfoNV* getMemoryRemoteAddressInfo, + VkRemoteAddressNV* pAddress); + + static VKAPI_ATTR void VKAPI_CALL CmdSetPatchControlPointsEXT( VkCommandBuffer commandBuffer, uint32_t patchControlPoints); @@ -3900,6 +3907,7 @@ static const std::unordered_map name_to_funcptr_map = { #ifdef VK_USE_PLATFORM_FUCHSIA {"vkGetSemaphoreZirconHandleFUCHSIA", (void*)GetSemaphoreZirconHandleFUCHSIA}, #endif + {"vkGetMemoryRemoteAddressNV", (void*)GetMemoryRemoteAddressNV}, {"vkCmdSetPatchControlPointsEXT", (void*)CmdSetPatchControlPointsEXT}, {"vkCmdSetRasterizerDiscardEnableEXT", (void*)CmdSetRasterizerDiscardEnableEXT}, {"vkCmdSetDepthBiasEnableEXT", (void*)CmdSetDepthBiasEnableEXT}, diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index 5bfe8263..60683f3b 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -4956,6 +4956,24 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_MEMORY_GET_REMOTE_ADDRESS_INFO_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkMemoryGetRemoteAddressInfoNV Type; +}; + +// Map type VkPhysicalDeviceExternalMemoryRDMAFeaturesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_RDMA_FEATURES_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_RDMA_FEATURES_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceExternalMemoryRDMAFeaturesNV Type; +}; + // Map type VkPhysicalDeviceExtendedDynamicState2FeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_2_FEATURES_EXT template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_2_FEATURES_EXT; diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py index 392aa353..da1ff756 100755 --- a/scripts/generate_vulkan_wrapper.py +++ b/scripts/generate_vulkan_wrapper.py @@ -1140,11 +1140,15 @@ VK_EXT_vertex_input_dynamic_state = Extension(name='VK_EXT_vertex_input_dynamic_ VK_EXT_physical_device_drm = Extension(name='VK_EXT_physical_device_drm', version=1, guard=None, commands=[ ]) -VK_HUAWEI_subpass_shading = Extension(name='VK_HUAWEI_subpass_shading', version=0, guard=None, commands=[ - Command(name='vkGetSubpassShadingMaxWorkgroupSizeHUAWEI', dispatch='VkRenderPass'), +VK_HUAWEI_subpass_shading = Extension(name='VK_HUAWEI_subpass_shading', version=2, guard=None, commands=[ + Command(name='vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI', dispatch='VkDevice'), Command(name='vkCmdSubpassShadingHUAWEI', dispatch='VkCommandBuffer'), ]) +VK_NV_external_memory_rdma = Extension(name='VK_NV_external_memory_rdma', version=1, guard=None, commands=[ + Command(name='vkGetMemoryRemoteAddressNV', dispatch='VkDevice'), +]) + VK_EXT_extended_dynamic_state2 = Extension(name='VK_EXT_extended_dynamic_state2', version=1, guard=None, commands=[ Command(name='vkCmdSetPatchControlPointsEXT', dispatch='VkCommandBuffer'), Command(name='vkCmdSetRasterizerDiscardEnableEXT', dispatch='VkCommandBuffer'), @@ -1558,6 +1562,7 @@ extensions = [ VK_EXT_vertex_input_dynamic_state, VK_EXT_physical_device_drm, VK_HUAWEI_subpass_shading, + VK_NV_external_memory_rdma, VK_EXT_extended_dynamic_state2, VK_EXT_color_write_enable, VK_EXT_global_priority_query, diff --git a/scripts/known_good.json b/scripts/known_good.json index e010b043..34648a74 100644 --- a/scripts/known_good.json +++ b/scripts/known_good.json @@ -6,7 +6,7 @@ "sub_dir" : "Vulkan-Headers", "build_dir" : "Vulkan-Headers/build", "install_dir" : "Vulkan-Headers/build/install", - "commit" : "v1.2.183" + "commit" : "v1.2.184" }, { "name" : "MoltenVK", @@ -30,7 +30,7 @@ "sub_dir" : "Vulkan-Loader", "build_dir" : "Vulkan-Loader/build", "install_dir" : "Vulkan-Loader/build/install", - "commit" : "v1.2.183", + "commit" : "v1.2.184", "deps" : [ { "var_name" : "VULKAN_HEADERS_INSTALL_DIR", diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp index 4635372b..df4c127a 100644 --- a/vulkaninfo/generated/vulkaninfo.hpp +++ b/vulkaninfo/generated/vulkaninfo.hpp @@ -681,6 +681,7 @@ std::vectorVkMemoryPropertyFlagBitsGetStrings(VkMemoryPropertyFlag if (0x20 & value) strings.push_back("MEMORY_PROPERTY_PROTECTED_BIT"); if (0x40 & value) strings.push_back("MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD"); if (0x80 & value) strings.push_back("MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD"); + if (0x100 & value) strings.push_back("MEMORY_PROPERTY_RDMA_CAPABLE_BIT_NV"); return strings; } void DumpVkMemoryPropertyFlags(Printer &p, std::string name, VkMemoryPropertyFlags value, int width = 0) { -- cgit v1.2.3