diff options
author | Shannon McPherson <shannon@lunarg.com> | 2020-12-19 01:33:16 +0300 |
---|---|---|
committer | Shannon McPherson <shannon@lunarg.com> | 2020-12-20 04:07:29 +0300 |
commit | 294480cb7f3e5b18082ad0294c61bb7648d00820 (patch) | |
tree | 01a99fe4262945e991c0f067c2fb7fd81e652264 | |
parent | 66a23ac8c566299343668f094de50798a5f4a0e4 (diff) |
build: Update known-good files for 1.2.165 headerv1.2.165
Changes:
- Updated `known_good.json`
- Generated new source files
Change-Id: I5156923b1d3fb96d9e4fbe8dddb533f93561adfd
-rw-r--r-- | loader/generated/vk_dispatch_table_helper.h | 6 | ||||
-rw-r--r-- | loader/generated/vk_layer_dispatch_table.h | 8 | ||||
-rw-r--r-- | loader/generated/vk_loader_extensions.c | 97 | ||||
-rw-r--r-- | loader/generated/vk_loader_extensions.h | 8 | ||||
-rw-r--r-- | scripts/known_good.json | 2 |
5 files changed, 120 insertions, 1 deletions
diff --git a/loader/generated/vk_dispatch_table_helper.h b/loader/generated/vk_dispatch_table_helper.h index 0eabfdb79..a6467fe54 100644 --- a/loader/generated/vk_dispatch_table_helper.h +++ b/loader/generated/vk_dispatch_table_helper.h @@ -942,6 +942,12 @@ static inline void layer_init_instance_dispatch_table(VkInstance instance, VkLay table->GetPhysicalDeviceSurfacePresentModes2EXT = (PFN_vkGetPhysicalDeviceSurfacePresentModes2EXT) gpa(instance, "vkGetPhysicalDeviceSurfacePresentModes2EXT"); #endif // VK_USE_PLATFORM_WIN32_KHR table->CreateHeadlessSurfaceEXT = (PFN_vkCreateHeadlessSurfaceEXT) gpa(instance, "vkCreateHeadlessSurfaceEXT"); +#ifdef VK_USE_PLATFORM_WIN32_KHR + table->AcquireWinrtDisplayNV = (PFN_vkAcquireWinrtDisplayNV) gpa(instance, "vkAcquireWinrtDisplayNV"); +#endif // VK_USE_PLATFORM_WIN32_KHR +#ifdef VK_USE_PLATFORM_WIN32_KHR + table->GetWinrtDisplayNV = (PFN_vkGetWinrtDisplayNV) gpa(instance, "vkGetWinrtDisplayNV"); +#endif // VK_USE_PLATFORM_WIN32_KHR #ifdef VK_USE_PLATFORM_DIRECTFB_EXT table->CreateDirectFBSurfaceEXT = (PFN_vkCreateDirectFBSurfaceEXT) gpa(instance, "vkCreateDirectFBSurfaceEXT"); #endif // VK_USE_PLATFORM_DIRECTFB_EXT diff --git a/loader/generated/vk_layer_dispatch_table.h b/loader/generated/vk_layer_dispatch_table.h index 45b20db45..b651fa9fd 100644 --- a/loader/generated/vk_layer_dispatch_table.h +++ b/loader/generated/vk_layer_dispatch_table.h @@ -237,6 +237,14 @@ typedef struct VkLayerInstanceDispatchTable_ { // ---- VK_EXT_headless_surface extension commands PFN_vkCreateHeadlessSurfaceEXT CreateHeadlessSurfaceEXT; + // ---- VK_NV_acquire_winrt_display extension commands +#ifdef VK_USE_PLATFORM_WIN32_KHR + PFN_vkAcquireWinrtDisplayNV AcquireWinrtDisplayNV; +#endif // VK_USE_PLATFORM_WIN32_KHR +#ifdef VK_USE_PLATFORM_WIN32_KHR + PFN_vkGetWinrtDisplayNV GetWinrtDisplayNV; +#endif // VK_USE_PLATFORM_WIN32_KHR + // ---- VK_EXT_directfb_surface extension commands #ifdef VK_USE_PLATFORM_DIRECTFB_EXT PFN_vkCreateDirectFBSurfaceEXT CreateDirectFBSurfaceEXT; diff --git a/loader/generated/vk_loader_extensions.c b/loader/generated/vk_loader_extensions.c index 7a37d0ec8..042f609d8 100644 --- a/loader/generated/vk_loader_extensions.c +++ b/loader/generated/vk_loader_extensions.c @@ -284,6 +284,14 @@ VKAPI_ATTR bool VKAPI_CALL loader_icd_init_entries(struct loader_icd_term *icd_t // ---- VK_EXT_headless_surface extension commands LOOKUP_GIPA(CreateHeadlessSurfaceEXT, false); + // ---- VK_NV_acquire_winrt_display extension commands +#ifdef VK_USE_PLATFORM_WIN32_KHR + LOOKUP_GIPA(AcquireWinrtDisplayNV, false); +#endif // VK_USE_PLATFORM_WIN32_KHR +#ifdef VK_USE_PLATFORM_WIN32_KHR + LOOKUP_GIPA(GetWinrtDisplayNV, false); +#endif // VK_USE_PLATFORM_WIN32_KHR + // ---- VK_EXT_directfb_surface extension commands #ifdef VK_USE_PLATFORM_DIRECTFB_EXT LOOKUP_GIPA(CreateDirectFBSurfaceEXT, false); @@ -1027,6 +1035,14 @@ VKAPI_ATTR void VKAPI_CALL loader_init_instance_extension_dispatch_table(VkLayer // ---- VK_EXT_headless_surface extension commands table->CreateHeadlessSurfaceEXT = (PFN_vkCreateHeadlessSurfaceEXT)gpa(inst, "vkCreateHeadlessSurfaceEXT"); + // ---- VK_NV_acquire_winrt_display extension commands +#ifdef VK_USE_PLATFORM_WIN32_KHR + table->AcquireWinrtDisplayNV = (PFN_vkAcquireWinrtDisplayNV)gpa(inst, "vkAcquireWinrtDisplayNV"); +#endif // VK_USE_PLATFORM_WIN32_KHR +#ifdef VK_USE_PLATFORM_WIN32_KHR + table->GetWinrtDisplayNV = (PFN_vkGetWinrtDisplayNV)gpa(inst, "vkGetWinrtDisplayNV"); +#endif // VK_USE_PLATFORM_WIN32_KHR + // ---- VK_EXT_directfb_surface extension commands #ifdef VK_USE_PLATFORM_DIRECTFB_EXT table->CreateDirectFBSurfaceEXT = (PFN_vkCreateDirectFBSurfaceEXT)gpa(inst, "vkCreateDirectFBSurfaceEXT"); @@ -1761,6 +1777,14 @@ VKAPI_ATTR void* VKAPI_CALL loader_lookup_instance_dispatch_table(const VkLayerI // ---- VK_EXT_headless_surface extension commands if (!strcmp(name, "CreateHeadlessSurfaceEXT")) return (void *)table->CreateHeadlessSurfaceEXT; + // ---- VK_NV_acquire_winrt_display extension commands +#ifdef VK_USE_PLATFORM_WIN32_KHR + if (!strcmp(name, "AcquireWinrtDisplayNV")) return (void *)table->AcquireWinrtDisplayNV; +#endif // VK_USE_PLATFORM_WIN32_KHR +#ifdef VK_USE_PLATFORM_WIN32_KHR + if (!strcmp(name, "GetWinrtDisplayNV")) return (void *)table->GetWinrtDisplayNV; +#endif // VK_USE_PLATFORM_WIN32_KHR + // ---- VK_EXT_directfb_surface extension commands #ifdef VK_USE_PLATFORM_DIRECTFB_EXT if (!strcmp(name, "CreateDirectFBSurfaceEXT")) return (void *)table->CreateDirectFBSurfaceEXT; @@ -3781,6 +3805,57 @@ VKAPI_ATTR void VKAPI_CALL CmdSetFragmentShadingRateEnumNV( } +// ---- VK_NV_acquire_winrt_display extension trampoline/terminators + +#ifdef VK_USE_PLATFORM_WIN32_KHR +VKAPI_ATTR VkResult VKAPI_CALL AcquireWinrtDisplayNV( + VkPhysicalDevice physicalDevice, + VkDisplayKHR display) { + const VkLayerInstanceDispatchTable *disp; + VkPhysicalDevice unwrapped_phys_dev = loader_unwrap_physical_device(physicalDevice); + disp = loader_get_instance_layer_dispatch(physicalDevice); + return disp->AcquireWinrtDisplayNV(unwrapped_phys_dev, display); +} + +VKAPI_ATTR VkResult VKAPI_CALL terminator_AcquireWinrtDisplayNV( + VkPhysicalDevice physicalDevice, + VkDisplayKHR display) { + struct loader_physical_device_term *phys_dev_term = (struct loader_physical_device_term *)physicalDevice; + struct loader_icd_term *icd_term = phys_dev_term->this_icd_term; + if (NULL == icd_term->dispatch.AcquireWinrtDisplayNV) { + loader_log(icd_term->this_instance, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0, + "ICD associated with VkPhysicalDevice does not support AcquireWinrtDisplayNV"); + } + return icd_term->dispatch.AcquireWinrtDisplayNV(phys_dev_term->phys_dev, display); +} + +#endif // VK_USE_PLATFORM_WIN32_KHR +#ifdef VK_USE_PLATFORM_WIN32_KHR +VKAPI_ATTR VkResult VKAPI_CALL GetWinrtDisplayNV( + VkPhysicalDevice physicalDevice, + uint32_t deviceRelativeId, + VkDisplayKHR* pDisplay) { + const VkLayerInstanceDispatchTable *disp; + VkPhysicalDevice unwrapped_phys_dev = loader_unwrap_physical_device(physicalDevice); + disp = loader_get_instance_layer_dispatch(physicalDevice); + return disp->GetWinrtDisplayNV(unwrapped_phys_dev, deviceRelativeId, pDisplay); +} + +VKAPI_ATTR VkResult VKAPI_CALL terminator_GetWinrtDisplayNV( + VkPhysicalDevice physicalDevice, + uint32_t deviceRelativeId, + VkDisplayKHR* pDisplay) { + struct loader_physical_device_term *phys_dev_term = (struct loader_physical_device_term *)physicalDevice; + struct loader_icd_term *icd_term = phys_dev_term->this_icd_term; + if (NULL == icd_term->dispatch.GetWinrtDisplayNV) { + loader_log(icd_term->this_instance, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0, + "ICD associated with VkPhysicalDevice does not support GetWinrtDisplayNV"); + } + return icd_term->dispatch.GetWinrtDisplayNV(phys_dev_term->phys_dev, deviceRelativeId, pDisplay); +} + +#endif // VK_USE_PLATFORM_WIN32_KHR + // ---- VK_KHR_acceleration_structure extension trampoline/terminators VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR( @@ -4992,6 +5067,20 @@ bool extension_instance_gpa(struct loader_instance *ptr_instance, const char *na return true; } + // ---- VK_NV_acquire_winrt_display extension commands +#ifdef VK_USE_PLATFORM_WIN32_KHR + if (!strcmp("vkAcquireWinrtDisplayNV", name)) { + *addr = (void *)AcquireWinrtDisplayNV; + return true; + } +#endif // VK_USE_PLATFORM_WIN32_KHR +#ifdef VK_USE_PLATFORM_WIN32_KHR + if (!strcmp("vkGetWinrtDisplayNV", name)) { + *addr = (void *)GetWinrtDisplayNV; + return true; + } +#endif // VK_USE_PLATFORM_WIN32_KHR + // ---- VK_KHR_acceleration_structure extension commands if (!strcmp("vkCreateAccelerationStructureKHR", name)) { *addr = (void *)CreateAccelerationStructureKHR; @@ -5410,6 +5499,14 @@ const VkLayerInstanceDispatchTable instance_disp = { // ---- VK_EXT_headless_surface extension commands .CreateHeadlessSurfaceEXT = terminator_CreateHeadlessSurfaceEXT, + // ---- VK_NV_acquire_winrt_display extension commands +#ifdef VK_USE_PLATFORM_WIN32_KHR + .AcquireWinrtDisplayNV = terminator_AcquireWinrtDisplayNV, +#endif // VK_USE_PLATFORM_WIN32_KHR +#ifdef VK_USE_PLATFORM_WIN32_KHR + .GetWinrtDisplayNV = terminator_GetWinrtDisplayNV, +#endif // VK_USE_PLATFORM_WIN32_KHR + // ---- VK_EXT_directfb_surface extension commands #ifdef VK_USE_PLATFORM_DIRECTFB_EXT .CreateDirectFBSurfaceEXT = terminator_CreateDirectFBSurfaceEXT, diff --git a/loader/generated/vk_loader_extensions.h b/loader/generated/vk_loader_extensions.h index 84e2150e1..b3498340d 100644 --- a/loader/generated/vk_loader_extensions.h +++ b/loader/generated/vk_loader_extensions.h @@ -432,6 +432,14 @@ struct loader_icd_term_dispatch { // ---- VK_EXT_headless_surface extension commands PFN_vkCreateHeadlessSurfaceEXT CreateHeadlessSurfaceEXT; + // ---- VK_NV_acquire_winrt_display extension commands +#ifdef VK_USE_PLATFORM_WIN32_KHR + PFN_vkAcquireWinrtDisplayNV AcquireWinrtDisplayNV; +#endif // VK_USE_PLATFORM_WIN32_KHR +#ifdef VK_USE_PLATFORM_WIN32_KHR + PFN_vkGetWinrtDisplayNV GetWinrtDisplayNV; +#endif // VK_USE_PLATFORM_WIN32_KHR + // ---- VK_EXT_directfb_surface extension commands #ifdef VK_USE_PLATFORM_DIRECTFB_EXT PFN_vkCreateDirectFBSurfaceEXT CreateDirectFBSurfaceEXT; diff --git a/scripts/known_good.json b/scripts/known_good.json index 0f44d6b80..da486d26e 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.162" + "commit" : "v1.2.165" } ], "install_names" : { |