diff options
author | Mike Schuchardt <mikes@lunarg.com> | 2022-06-13 22:02:40 +0300 |
---|---|---|
committer | Mike Schuchardt <mikes@lunarg.com> | 2022-06-13 22:54:07 +0300 |
commit | 71e43122c90f19aca9c387cb43903a0d2e002b08 (patch) | |
tree | 81f2585ed2f0500f6e0f0c659fa9655f400c3878 | |
parent | c3601d4d914212a22e0ebed5329847b9ce89596f (diff) |
build: Update to header 1.3.217v1.3.217
- Update known-good
- Generate source
-rw-r--r-- | loader/generated/loader_generated_header_version.cmake | 2 | ||||
-rw-r--r-- | loader/generated/vk_dispatch_table_helper.h | 7 | ||||
-rw-r--r-- | loader/generated/vk_layer_dispatch_table.h | 5 | ||||
-rw-r--r-- | loader/generated/vk_loader_extensions.c | 36 | ||||
-rw-r--r-- | scripts/known_good.json | 2 |
5 files changed, 50 insertions, 2 deletions
diff --git a/loader/generated/loader_generated_header_version.cmake b/loader/generated/loader_generated_header_version.cmake index 3d77c1ef3..cad8634ef 100644 --- a/loader/generated/loader_generated_header_version.cmake +++ b/loader/generated/loader_generated_header_version.cmake @@ -24,5 +24,5 @@ # ############################################################################ -set(LOADER_GENERATED_HEADER_VERSION "1.3.216") +set(LOADER_GENERATED_HEADER_VERSION "1.3.217") diff --git a/loader/generated/vk_dispatch_table_helper.h b/loader/generated/vk_dispatch_table_helper.h index 4d158320b..4bb426452 100644 --- a/loader/generated/vk_dispatch_table_helper.h +++ b/loader/generated/vk_dispatch_table_helper.h @@ -276,6 +276,9 @@ static VKAPI_ATTR VkResult VKAPI_CALL StubCreatePrivateDataSlotEXT(VkDevice devi static VKAPI_ATTR void VKAPI_CALL StubDestroyPrivateDataSlotEXT(VkDevice device, VkPrivateDataSlot privateDataSlot, const VkAllocationCallbacks* pAllocator) { } static VKAPI_ATTR VkResult VKAPI_CALL StubSetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlot privateDataSlot, uint64_t data) { return VK_SUCCESS; } static VKAPI_ATTR void VKAPI_CALL StubGetPrivateDataEXT(VkDevice device, VkObjectType objectType, uint64_t objectHandle, VkPrivateDataSlot privateDataSlot, uint64_t* pData) { } +#ifdef VK_USE_PLATFORM_METAL_EXT +static VKAPI_ATTR void VKAPI_CALL StubExportMetalObjectsEXT(VkDevice device, VkExportMetalObjectsInfoEXT* pMetalObjectsInfo) { } +#endif // VK_USE_PLATFORM_METAL_EXT static VKAPI_ATTR void VKAPI_CALL StubCmdSetFragmentShadingRateEnumNV(VkCommandBuffer commandBuffer, VkFragmentShadingRateNV shadingRate, const VkFragmentShadingRateCombinerOpKHR combinerOps[2]) { } static VKAPI_ATTR void VKAPI_CALL StubGetImageSubresourceLayout2EXT(VkDevice device, VkImage image, const VkImageSubresource2EXT* pSubresource, VkSubresourceLayout2EXT* pLayout) { } static VKAPI_ATTR void VKAPI_CALL StubCmdSetVertexInputEXT(VkCommandBuffer commandBuffer, uint32_t vertexBindingDescriptionCount, const VkVertexInputBindingDescription2EXT* pVertexBindingDescriptions, uint32_t vertexAttributeDescriptionCount, const VkVertexInputAttributeDescription2EXT* pVertexAttributeDescriptions) { } @@ -992,6 +995,10 @@ static inline void layer_init_device_dispatch_table(VkDevice device, VkLayerDisp if (table->SetPrivateDataEXT == nullptr) { table->SetPrivateDataEXT = (PFN_vkSetPrivateDataEXT)StubSetPrivateDataEXT; } table->GetPrivateDataEXT = (PFN_vkGetPrivateDataEXT) gpa(device, "vkGetPrivateDataEXT"); if (table->GetPrivateDataEXT == nullptr) { table->GetPrivateDataEXT = (PFN_vkGetPrivateDataEXT)StubGetPrivateDataEXT; } +#ifdef VK_USE_PLATFORM_METAL_EXT + table->ExportMetalObjectsEXT = (PFN_vkExportMetalObjectsEXT) gpa(device, "vkExportMetalObjectsEXT"); + if (table->ExportMetalObjectsEXT == nullptr) { table->ExportMetalObjectsEXT = (PFN_vkExportMetalObjectsEXT)StubExportMetalObjectsEXT; } +#endif // VK_USE_PLATFORM_METAL_EXT table->CmdSetFragmentShadingRateEnumNV = (PFN_vkCmdSetFragmentShadingRateEnumNV) gpa(device, "vkCmdSetFragmentShadingRateEnumNV"); if (table->CmdSetFragmentShadingRateEnumNV == nullptr) { table->CmdSetFragmentShadingRateEnumNV = (PFN_vkCmdSetFragmentShadingRateEnumNV)StubCmdSetFragmentShadingRateEnumNV; } table->GetImageSubresourceLayout2EXT = (PFN_vkGetImageSubresourceLayout2EXT) gpa(device, "vkGetImageSubresourceLayout2EXT"); diff --git a/loader/generated/vk_layer_dispatch_table.h b/loader/generated/vk_layer_dispatch_table.h index 31868e575..cca540972 100644 --- a/loader/generated/vk_layer_dispatch_table.h +++ b/loader/generated/vk_layer_dispatch_table.h @@ -869,6 +869,11 @@ typedef struct VkLayerDispatchTable_ { PFN_vkSetPrivateDataEXT SetPrivateDataEXT; PFN_vkGetPrivateDataEXT GetPrivateDataEXT; + // ---- VK_EXT_metal_objects extension commands +#ifdef VK_USE_PLATFORM_METAL_EXT + PFN_vkExportMetalObjectsEXT ExportMetalObjectsEXT; +#endif // VK_USE_PLATFORM_METAL_EXT + // ---- VK_NV_fragment_shading_rate_enums extension commands PFN_vkCmdSetFragmentShadingRateEnumNV CmdSetFragmentShadingRateEnumNV; diff --git a/loader/generated/vk_loader_extensions.c b/loader/generated/vk_loader_extensions.c index d96ca300a..fb7bdd78b 100644 --- a/loader/generated/vk_loader_extensions.c +++ b/loader/generated/vk_loader_extensions.c @@ -929,6 +929,11 @@ VKAPI_ATTR void VKAPI_CALL loader_init_device_extension_dispatch_table(struct lo table->SetPrivateDataEXT = (PFN_vkSetPrivateDataEXT)gdpa(dev, "vkSetPrivateDataEXT"); table->GetPrivateDataEXT = (PFN_vkGetPrivateDataEXT)gdpa(dev, "vkGetPrivateDataEXT"); + // ---- VK_EXT_metal_objects extension commands +#ifdef VK_USE_PLATFORM_METAL_EXT + table->ExportMetalObjectsEXT = (PFN_vkExportMetalObjectsEXT)gdpa(dev, "vkExportMetalObjectsEXT"); +#endif // VK_USE_PLATFORM_METAL_EXT + // ---- VK_NV_fragment_shading_rate_enums extension commands table->CmdSetFragmentShadingRateEnumNV = (PFN_vkCmdSetFragmentShadingRateEnumNV)gdpa(dev, "vkCmdSetFragmentShadingRateEnumNV"); @@ -1875,6 +1880,11 @@ VKAPI_ATTR void* VKAPI_CALL loader_lookup_device_dispatch_table(const VkLayerDis if (!strcmp(name, "SetPrivateDataEXT")) return (void *)table->SetPrivateDataEXT; if (!strcmp(name, "GetPrivateDataEXT")) return (void *)table->GetPrivateDataEXT; + // ---- VK_EXT_metal_objects extension commands +#ifdef VK_USE_PLATFORM_METAL_EXT + if (!strcmp(name, "ExportMetalObjectsEXT")) return (void *)table->ExportMetalObjectsEXT; +#endif // VK_USE_PLATFORM_METAL_EXT + // ---- VK_NV_fragment_shading_rate_enums extension commands if (!strcmp(name, "CmdSetFragmentShadingRateEnumNV")) return (void *)table->CmdSetFragmentShadingRateEnumNV; @@ -5881,6 +5891,24 @@ VKAPI_ATTR void VKAPI_CALL GetPrivateDataEXT( } +// ---- VK_EXT_metal_objects extension trampoline/terminators + +#ifdef VK_USE_PLATFORM_METAL_EXT +VKAPI_ATTR void VKAPI_CALL ExportMetalObjectsEXT( + VkDevice device, + VkExportMetalObjectsInfoEXT* pMetalObjectsInfo) { + const VkLayerDispatchTable *disp = loader_get_dispatch(device); + if (NULL == disp) { + loader_log(NULL, VULKAN_LOADER_ERROR_BIT | VULKAN_LOADER_VALIDATION_BIT, 0, + "vkExportMetalObjectsEXT: Invalid device " + "[VUID-vkExportMetalObjectsEXT-device-parameter]"); + abort(); /* Intentionally fail so user can correct issue. */ + } + disp->ExportMetalObjectsEXT(device, pMetalObjectsInfo); +} + +#endif // VK_USE_PLATFORM_METAL_EXT + // ---- VK_NV_fragment_shading_rate_enums extension trampoline/terminators VKAPI_ATTR void VKAPI_CALL CmdSetFragmentShadingRateEnumNV( @@ -7928,6 +7956,14 @@ bool extension_instance_gpa(struct loader_instance *ptr_instance, const char *na return true; } + // ---- VK_EXT_metal_objects extension commands +#ifdef VK_USE_PLATFORM_METAL_EXT + if (!strcmp("vkExportMetalObjectsEXT", name)) { + *addr = (void *)ExportMetalObjectsEXT; + return true; + } +#endif // VK_USE_PLATFORM_METAL_EXT + // ---- VK_NV_fragment_shading_rate_enums extension commands if (!strcmp("vkCmdSetFragmentShadingRateEnumNV", name)) { *addr = (void *)CmdSetFragmentShadingRateEnumNV; diff --git a/scripts/known_good.json b/scripts/known_good.json index b5e4e5275..8a098df85 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.3.216" + "commit": "v1.3.217" }, { "name": "googletest", |