From cc3faa040bc2b3622314b482d255d900e6a22baf Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Tue, 6 Jul 2021 11:57:06 -0700 Subject: [PATCH] build: Update to header 1.2.184 - Update known-good - Generate source Change-Id: Ib2cfed88095541a127c23cf7418e9a66d81bd35e --- loader/generated/vk_dispatch_table_helper.h | 3 +++ loader/generated/vk_layer_dispatch_table.h | 3 +++ loader/generated/vk_loader_extensions.c | 23 +++++++++++++++++++++ scripts/known_good.json | 2 +- 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/loader/generated/vk_dispatch_table_helper.h b/loader/generated/vk_dispatch_table_helper.h index af49c1c5..93f28525 100644 --- a/loader/generated/vk_dispatch_table_helper.h +++ b/loader/generated/vk_dispatch_table_helper.h @@ -283,6 +283,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL StubImportSemaphoreZirconHandleFUCHSIA(VkD #ifdef VK_USE_PLATFORM_FUCHSIA static VKAPI_ATTR VkResult VKAPI_CALL StubGetSemaphoreZirconHandleFUCHSIA(VkDevice device, const VkSemaphoreGetZirconHandleInfoFUCHSIA* pGetZirconHandleInfo, zx_handle_t* pZirconHandle) { return VK_SUCCESS; }; #endif // VK_USE_PLATFORM_FUCHSIA +static VKAPI_ATTR VkResult VKAPI_CALL StubGetMemoryRemoteAddressNV(VkDevice device, const VkMemoryGetRemoteAddressInfoNV* getMemoryRemoteAddressInfo, VkRemoteAddressNV* pAddress) { return VK_SUCCESS; }; static VKAPI_ATTR void VKAPI_CALL StubCmdSetPatchControlPointsEXT(VkCommandBuffer commandBuffer, uint32_t patchControlPoints) { }; static VKAPI_ATTR void VKAPI_CALL StubCmdSetRasterizerDiscardEnableEXT(VkCommandBuffer commandBuffer, VkBool32 rasterizerDiscardEnable) { }; static VKAPI_ATTR void VKAPI_CALL StubCmdSetDepthBiasEnableEXT(VkCommandBuffer commandBuffer, VkBool32 depthBiasEnable) { }; @@ -929,6 +930,8 @@ static inline void layer_init_device_dispatch_table(VkDevice device, VkLayerDisp table->GetSemaphoreZirconHandleFUCHSIA = (PFN_vkGetSemaphoreZirconHandleFUCHSIA) gpa(device, "vkGetSemaphoreZirconHandleFUCHSIA"); if (table->GetSemaphoreZirconHandleFUCHSIA == nullptr) { table->GetSemaphoreZirconHandleFUCHSIA = (PFN_vkGetSemaphoreZirconHandleFUCHSIA)StubGetSemaphoreZirconHandleFUCHSIA; } #endif // VK_USE_PLATFORM_FUCHSIA + table->GetMemoryRemoteAddressNV = (PFN_vkGetMemoryRemoteAddressNV) gpa(device, "vkGetMemoryRemoteAddressNV"); + if (table->GetMemoryRemoteAddressNV == nullptr) { table->GetMemoryRemoteAddressNV = (PFN_vkGetMemoryRemoteAddressNV)StubGetMemoryRemoteAddressNV; } table->CmdSetPatchControlPointsEXT = (PFN_vkCmdSetPatchControlPointsEXT) gpa(device, "vkCmdSetPatchControlPointsEXT"); if (table->CmdSetPatchControlPointsEXT == nullptr) { table->CmdSetPatchControlPointsEXT = (PFN_vkCmdSetPatchControlPointsEXT)StubCmdSetPatchControlPointsEXT; } table->CmdSetRasterizerDiscardEnableEXT = (PFN_vkCmdSetRasterizerDiscardEnableEXT) gpa(device, "vkCmdSetRasterizerDiscardEnableEXT"); diff --git a/loader/generated/vk_layer_dispatch_table.h b/loader/generated/vk_layer_dispatch_table.h index 02b8471b..02d464cf 100644 --- a/loader/generated/vk_layer_dispatch_table.h +++ b/loader/generated/vk_layer_dispatch_table.h @@ -833,6 +833,9 @@ typedef struct VkLayerDispatchTable_ { PFN_vkGetSemaphoreZirconHandleFUCHSIA GetSemaphoreZirconHandleFUCHSIA; #endif // VK_USE_PLATFORM_FUCHSIA + // ---- VK_NV_external_memory_rdma extension commands + PFN_vkGetMemoryRemoteAddressNV GetMemoryRemoteAddressNV; + // ---- VK_EXT_extended_dynamic_state2 extension commands PFN_vkCmdSetPatchControlPointsEXT CmdSetPatchControlPointsEXT; PFN_vkCmdSetRasterizerDiscardEnableEXT CmdSetRasterizerDiscardEnableEXT; diff --git a/loader/generated/vk_loader_extensions.c b/loader/generated/vk_loader_extensions.c index ea65ae3b..cf0bccc1 100644 --- a/loader/generated/vk_loader_extensions.c +++ b/loader/generated/vk_loader_extensions.c @@ -896,6 +896,9 @@ VKAPI_ATTR void VKAPI_CALL loader_init_device_extension_dispatch_table(struct lo table->GetSemaphoreZirconHandleFUCHSIA = (PFN_vkGetSemaphoreZirconHandleFUCHSIA)gdpa(dev, "vkGetSemaphoreZirconHandleFUCHSIA"); #endif // VK_USE_PLATFORM_FUCHSIA + // ---- VK_NV_external_memory_rdma extension commands + table->GetMemoryRemoteAddressNV = (PFN_vkGetMemoryRemoteAddressNV)gdpa(dev, "vkGetMemoryRemoteAddressNV"); + // ---- VK_EXT_extended_dynamic_state2 extension commands table->CmdSetPatchControlPointsEXT = (PFN_vkCmdSetPatchControlPointsEXT)gdpa(dev, "vkCmdSetPatchControlPointsEXT"); table->CmdSetRasterizerDiscardEnableEXT = (PFN_vkCmdSetRasterizerDiscardEnableEXT)gdpa(dev, "vkCmdSetRasterizerDiscardEnableEXT"); @@ -1746,6 +1749,9 @@ VKAPI_ATTR void* VKAPI_CALL loader_lookup_device_dispatch_table(const VkLayerDis if (!strcmp(name, "GetSemaphoreZirconHandleFUCHSIA")) return (void *)table->GetSemaphoreZirconHandleFUCHSIA; #endif // VK_USE_PLATFORM_FUCHSIA + // ---- VK_NV_external_memory_rdma extension commands + if (!strcmp(name, "GetMemoryRemoteAddressNV")) return (void *)table->GetMemoryRemoteAddressNV; + // ---- VK_EXT_extended_dynamic_state2 extension commands if (!strcmp(name, "CmdSetPatchControlPointsEXT")) return (void *)table->CmdSetPatchControlPointsEXT; if (!strcmp(name, "CmdSetRasterizerDiscardEnableEXT")) return (void *)table->CmdSetRasterizerDiscardEnableEXT; @@ -4505,6 +4511,17 @@ VKAPI_ATTR VkResult VKAPI_CALL GetSemaphoreZirconHandleFUCHSIA( #endif // VK_USE_PLATFORM_FUCHSIA +// ---- VK_NV_external_memory_rdma extension trampoline/terminators + +VKAPI_ATTR VkResult VKAPI_CALL GetMemoryRemoteAddressNV( + VkDevice device, + const VkMemoryGetRemoteAddressInfoNV* getMemoryRemoteAddressInfo, + VkRemoteAddressNV* pAddress) { + const VkLayerDispatchTable *disp = loader_get_dispatch(device); + return disp->GetMemoryRemoteAddressNV(device, getMemoryRemoteAddressInfo, pAddress); +} + + // ---- VK_EXT_extended_dynamic_state2 extension trampoline/terminators VKAPI_ATTR void VKAPI_CALL CmdSetPatchControlPointsEXT( @@ -5999,6 +6016,12 @@ bool extension_instance_gpa(struct loader_instance *ptr_instance, const char *na } #endif // VK_USE_PLATFORM_FUCHSIA + // ---- VK_NV_external_memory_rdma extension commands + if (!strcmp("vkGetMemoryRemoteAddressNV", name)) { + *addr = (void *)GetMemoryRemoteAddressNV; + return true; + } + // ---- VK_EXT_extended_dynamic_state2 extension commands if (!strcmp("vkCmdSetPatchControlPointsEXT", name)) { *addr = (void *)CmdSetPatchControlPointsEXT; diff --git a/scripts/known_good.json b/scripts/known_good.json index 5413ec73..15201fc9 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" } ], "install_names" : {