diff options
author | Shannon McPherson <shannon@lunarg.com> | 2021-03-01 20:27:51 +0300 |
---|---|---|
committer | Lenny Komow <lenny@lunarg.com> | 2021-03-03 01:40:45 +0300 |
commit | 237d3dcb5c67575db335bbc226c8fff23925bf49 (patch) | |
tree | 0ff71ce5f40cc46b4fc58ef53408a500da152b04 | |
parent | 55c6dc0ab95e94026c846e18be28ebb167aea499 (diff) |
build: Update known-good files for 1.2.171 headerv1.2.171
Changes:
- Updated `known_good.json`
- Generated new source files
- Added `VK_USE_PLATFORM_SCREEN_QNX` to platform list in
`common_codegen.py`
Change-Id: I2ef49799434ff31ff81680413a8700caea46593c
-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 | 106 | ||||
-rw-r--r-- | loader/generated/vk_loader_extensions.h | 9 | ||||
-rw-r--r-- | scripts/common_codegen.py | 1 | ||||
-rw-r--r-- | scripts/known_good.json | 2 |
6 files changed, 131 insertions, 1 deletions
diff --git a/loader/generated/vk_dispatch_table_helper.h b/loader/generated/vk_dispatch_table_helper.h index 5c28e2453..b49c23688 100644 --- a/loader/generated/vk_dispatch_table_helper.h +++ b/loader/generated/vk_dispatch_table_helper.h @@ -978,4 +978,10 @@ static inline void layer_init_instance_dispatch_table(VkInstance instance, VkLay #ifdef VK_USE_PLATFORM_DIRECTFB_EXT table->GetPhysicalDeviceDirectFBPresentationSupportEXT = (PFN_vkGetPhysicalDeviceDirectFBPresentationSupportEXT) gpa(instance, "vkGetPhysicalDeviceDirectFBPresentationSupportEXT"); #endif // VK_USE_PLATFORM_DIRECTFB_EXT +#ifdef VK_USE_PLATFORM_SCREEN_QNX + table->CreateScreenSurfaceQNX = (PFN_vkCreateScreenSurfaceQNX) gpa(instance, "vkCreateScreenSurfaceQNX"); +#endif // VK_USE_PLATFORM_SCREEN_QNX +#ifdef VK_USE_PLATFORM_SCREEN_QNX + table->GetPhysicalDeviceScreenPresentationSupportQNX = (PFN_vkGetPhysicalDeviceScreenPresentationSupportQNX) gpa(instance, "vkGetPhysicalDeviceScreenPresentationSupportQNX"); +#endif // VK_USE_PLATFORM_SCREEN_QNX } diff --git a/loader/generated/vk_layer_dispatch_table.h b/loader/generated/vk_layer_dispatch_table.h index 56cf4eb3c..aed9c7581 100644 --- a/loader/generated/vk_layer_dispatch_table.h +++ b/loader/generated/vk_layer_dispatch_table.h @@ -252,6 +252,14 @@ typedef struct VkLayerInstanceDispatchTable_ { #ifdef VK_USE_PLATFORM_DIRECTFB_EXT PFN_vkGetPhysicalDeviceDirectFBPresentationSupportEXT GetPhysicalDeviceDirectFBPresentationSupportEXT; #endif // VK_USE_PLATFORM_DIRECTFB_EXT + + // ---- VK_QNX_screen_surface extension commands +#ifdef VK_USE_PLATFORM_SCREEN_QNX + PFN_vkCreateScreenSurfaceQNX CreateScreenSurfaceQNX; +#endif // VK_USE_PLATFORM_SCREEN_QNX +#ifdef VK_USE_PLATFORM_SCREEN_QNX + PFN_vkGetPhysicalDeviceScreenPresentationSupportQNX GetPhysicalDeviceScreenPresentationSupportQNX; +#endif // VK_USE_PLATFORM_SCREEN_QNX } VkLayerInstanceDispatchTable; // Device function pointer dispatch table diff --git a/loader/generated/vk_loader_extensions.c b/loader/generated/vk_loader_extensions.c index ac590cd3d..3e9c542d3 100644 --- a/loader/generated/vk_loader_extensions.c +++ b/loader/generated/vk_loader_extensions.c @@ -300,6 +300,14 @@ VKAPI_ATTR bool VKAPI_CALL loader_icd_init_entries(struct loader_icd_term *icd_t LOOKUP_GIPA(GetPhysicalDeviceDirectFBPresentationSupportEXT, false); #endif // VK_USE_PLATFORM_DIRECTFB_EXT + // ---- VK_QNX_screen_surface extension commands +#ifdef VK_USE_PLATFORM_SCREEN_QNX + LOOKUP_GIPA(CreateScreenSurfaceQNX, false); +#endif // VK_USE_PLATFORM_SCREEN_QNX +#ifdef VK_USE_PLATFORM_SCREEN_QNX + LOOKUP_GIPA(GetPhysicalDeviceScreenPresentationSupportQNX, false); +#endif // VK_USE_PLATFORM_SCREEN_QNX + #undef LOOKUP_GIPA return true; @@ -1060,6 +1068,14 @@ VKAPI_ATTR void VKAPI_CALL loader_init_instance_extension_dispatch_table(VkLayer #ifdef VK_USE_PLATFORM_DIRECTFB_EXT table->GetPhysicalDeviceDirectFBPresentationSupportEXT = (PFN_vkGetPhysicalDeviceDirectFBPresentationSupportEXT)gpa(inst, "vkGetPhysicalDeviceDirectFBPresentationSupportEXT"); #endif // VK_USE_PLATFORM_DIRECTFB_EXT + + // ---- VK_QNX_screen_surface extension commands +#ifdef VK_USE_PLATFORM_SCREEN_QNX + table->CreateScreenSurfaceQNX = (PFN_vkCreateScreenSurfaceQNX)gpa(inst, "vkCreateScreenSurfaceQNX"); +#endif // VK_USE_PLATFORM_SCREEN_QNX +#ifdef VK_USE_PLATFORM_SCREEN_QNX + table->GetPhysicalDeviceScreenPresentationSupportQNX = (PFN_vkGetPhysicalDeviceScreenPresentationSupportQNX)gpa(inst, "vkGetPhysicalDeviceScreenPresentationSupportQNX"); +#endif // VK_USE_PLATFORM_SCREEN_QNX } // Device command lookup function @@ -1813,6 +1829,14 @@ VKAPI_ATTR void* VKAPI_CALL loader_lookup_instance_dispatch_table(const VkLayerI if (!strcmp(name, "GetPhysicalDeviceDirectFBPresentationSupportEXT")) return (void *)table->GetPhysicalDeviceDirectFBPresentationSupportEXT; #endif // VK_USE_PLATFORM_DIRECTFB_EXT + // ---- VK_QNX_screen_surface extension commands +#ifdef VK_USE_PLATFORM_SCREEN_QNX + if (!strcmp(name, "CreateScreenSurfaceQNX")) return (void *)table->CreateScreenSurfaceQNX; +#endif // VK_USE_PLATFORM_SCREEN_QNX +#ifdef VK_USE_PLATFORM_SCREEN_QNX + if (!strcmp(name, "GetPhysicalDeviceScreenPresentationSupportQNX")) return (void *)table->GetPhysicalDeviceScreenPresentationSupportQNX; +#endif // VK_USE_PLATFORM_SCREEN_QNX + *found_name = false; return NULL; } @@ -3947,6 +3971,53 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetWinrtDisplayNV( #endif // VK_USE_PLATFORM_WIN32_KHR +// ---- VK_QNX_screen_surface extension trampoline/terminators + +#ifdef VK_USE_PLATFORM_SCREEN_QNX +VKAPI_ATTR VkResult VKAPI_CALL CreateScreenSurfaceQNX( + VkInstance instance, + const VkScreenSurfaceCreateInfoQNX* pCreateInfo, + const VkAllocationCallbacks* pAllocator, + VkSurfaceKHR* pSurface) { +#error("Not implemented. Likely needs to be manually generated!"); + return disp->CreateScreenSurfaceQNX(instance, pCreateInfo, pAllocator, pSurface); +} + +VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateScreenSurfaceQNX( + VkInstance instance, + const VkScreenSurfaceCreateInfoQNX* pCreateInfo, + const VkAllocationCallbacks* pAllocator, + VkSurfaceKHR* pSurface) { +#error("Not implemented. Likely needs to be manually generated!"); +} + +#endif // VK_USE_PLATFORM_SCREEN_QNX +#ifdef VK_USE_PLATFORM_SCREEN_QNX +VKAPI_ATTR VkBool32 VKAPI_CALL GetPhysicalDeviceScreenPresentationSupportQNX( + VkPhysicalDevice physicalDevice, + uint32_t queueFamilyIndex, + struct _screen_window* window) { + const VkLayerInstanceDispatchTable *disp; + VkPhysicalDevice unwrapped_phys_dev = loader_unwrap_physical_device(physicalDevice); + disp = loader_get_instance_layer_dispatch(physicalDevice); + return disp->GetPhysicalDeviceScreenPresentationSupportQNX(unwrapped_phys_dev, queueFamilyIndex, window); +} + +VKAPI_ATTR VkBool32 VKAPI_CALL terminator_GetPhysicalDeviceScreenPresentationSupportQNX( + VkPhysicalDevice physicalDevice, + uint32_t queueFamilyIndex, + struct _screen_window* window) { + 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.GetPhysicalDeviceScreenPresentationSupportQNX) { + loader_log(icd_term->this_instance, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0, + "ICD associated with VkPhysicalDevice does not support GetPhysicalDeviceScreenPresentationSupportQNX"); + } + return icd_term->dispatch.GetPhysicalDeviceScreenPresentationSupportQNX(phys_dev_term->phys_dev, queueFamilyIndex, window); +} + +#endif // VK_USE_PLATFORM_SCREEN_QNX + // ---- VK_KHR_acceleration_structure extension trampoline/terminators VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR( @@ -5206,6 +5277,24 @@ bool extension_instance_gpa(struct loader_instance *ptr_instance, const char *na } #endif // VK_USE_PLATFORM_WIN32_KHR + // ---- VK_QNX_screen_surface extension commands +#ifdef VK_USE_PLATFORM_SCREEN_QNX + if (!strcmp("vkCreateScreenSurfaceQNX", name)) { + *addr = (ptr_instance->enabled_known_extensions.qnx_screen_surface == 1) + ? (void *)CreateScreenSurfaceQNX + : NULL; + return true; + } +#endif // VK_USE_PLATFORM_SCREEN_QNX +#ifdef VK_USE_PLATFORM_SCREEN_QNX + if (!strcmp("vkGetPhysicalDeviceScreenPresentationSupportQNX", name)) { + *addr = (ptr_instance->enabled_known_extensions.qnx_screen_surface == 1) + ? (void *)GetPhysicalDeviceScreenPresentationSupportQNX + : NULL; + return true; + } +#endif // VK_USE_PLATFORM_SCREEN_QNX + // ---- VK_KHR_acceleration_structure extension commands if (!strcmp("vkCreateAccelerationStructureKHR", name)) { *addr = (void *)CreateAccelerationStructureKHR; @@ -5351,6 +5440,12 @@ void extensions_create_instance(struct loader_instance *ptr_instance, const VkIn // ---- VK_EXT_debug_utils extension commands } else if (0 == strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_DEBUG_UTILS_EXTENSION_NAME)) { ptr_instance->enabled_known_extensions.ext_debug_utils = 1; + + // ---- VK_QNX_screen_surface extension commands +#ifdef VK_USE_PLATFORM_SCREEN_QNX + } else if (0 == strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_QNX_SCREEN_SURFACE_EXTENSION_NAME)) { + ptr_instance->enabled_known_extensions.qnx_screen_surface = 1; +#endif // VK_USE_PLATFORM_SCREEN_QNX } } } @@ -5639,6 +5734,14 @@ const VkLayerInstanceDispatchTable instance_disp = { #ifdef VK_USE_PLATFORM_DIRECTFB_EXT .GetPhysicalDeviceDirectFBPresentationSupportEXT = terminator_GetPhysicalDeviceDirectFBPresentationSupportEXT, #endif // VK_USE_PLATFORM_DIRECTFB_EXT + + // ---- VK_QNX_screen_surface extension commands +#ifdef VK_USE_PLATFORM_SCREEN_QNX + .CreateScreenSurfaceQNX = terminator_CreateScreenSurfaceQNX, +#endif // VK_USE_PLATFORM_SCREEN_QNX +#ifdef VK_USE_PLATFORM_SCREEN_QNX + .GetPhysicalDeviceScreenPresentationSupportQNX = terminator_GetPhysicalDeviceScreenPresentationSupportQNX, +#endif // VK_USE_PLATFORM_SCREEN_QNX }; // A null-terminated list of all of the instance extensions supported by the loader. @@ -5701,5 +5804,8 @@ const char *const LOADER_INSTANCE_EXTENSIONS[] = { #ifdef VK_USE_PLATFORM_DIRECTFB_EXT VK_EXT_DIRECTFB_SURFACE_EXTENSION_NAME, #endif // VK_USE_PLATFORM_DIRECTFB_EXT +#ifdef VK_USE_PLATFORM_SCREEN_QNX + VK_QNX_SCREEN_SURFACE_EXTENSION_NAME, +#endif // VK_USE_PLATFORM_SCREEN_QNX NULL }; diff --git a/loader/generated/vk_loader_extensions.h b/loader/generated/vk_loader_extensions.h index b3498340d..62d7ed8fd 100644 --- a/loader/generated/vk_loader_extensions.h +++ b/loader/generated/vk_loader_extensions.h @@ -447,6 +447,14 @@ struct loader_icd_term_dispatch { #ifdef VK_USE_PLATFORM_DIRECTFB_EXT PFN_vkGetPhysicalDeviceDirectFBPresentationSupportEXT GetPhysicalDeviceDirectFBPresentationSupportEXT; #endif // VK_USE_PLATFORM_DIRECTFB_EXT + + // ---- VK_QNX_screen_surface extension commands +#ifdef VK_USE_PLATFORM_SCREEN_QNX + PFN_vkCreateScreenSurfaceQNX CreateScreenSurfaceQNX; +#endif // VK_USE_PLATFORM_SCREEN_QNX +#ifdef VK_USE_PLATFORM_SCREEN_QNX + PFN_vkGetPhysicalDeviceScreenPresentationSupportQNX GetPhysicalDeviceScreenPresentationSupportQNX; +#endif // VK_USE_PLATFORM_SCREEN_QNX }; union loader_instance_extension_enables { @@ -463,6 +471,7 @@ union loader_instance_extension_enables { uint8_t ext_acquire_xlib_display : 1; uint8_t ext_display_surface_counter : 1; uint8_t ext_debug_utils : 1; + uint8_t qnx_screen_surface : 1; }; uint64_t padding[4]; }; diff --git a/scripts/common_codegen.py b/scripts/common_codegen.py index 9744bb3fe..92ebb5a72 100644 --- a/scripts/common_codegen.py +++ b/scripts/common_codegen.py @@ -59,6 +59,7 @@ platform_dict = { 'directfb' : 'VK_USE_PLATFORM_DIRECTFB_EXT', 'xlib_xrandr' : 'VK_USE_PLATFORM_XLIB_XRANDR_EXT', 'provisional' : 'VK_ENABLE_BETA_EXTENSIONS', + 'screen' : 'VK_USE_PLATFORM_SCREEN_QNX', } # diff --git a/scripts/known_good.json b/scripts/known_good.json index 2c86fd1fa..4246fbbbd 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.170" + "commit" : "4fe5828a0295a3c29a266e446ac6a6b51d768e48" } ], "install_names" : { |