diff options
| -rw-r--r-- | loader/debug_report.c | 16 | ||||
| -rw-r--r-- | loader/debug_report.h | 16 | ||||
| -rw-r--r-- | loader/loader.c | 813 | ||||
| -rw-r--r-- | loader/loader.h | 181 | ||||
| -rw-r--r-- | loader/trampoline.c | 359 | ||||
| -rw-r--r-- | loader/wsi.c | 194 | ||||
| -rw-r--r-- | loader/wsi.h | 80 |
7 files changed, 842 insertions, 817 deletions
diff --git a/loader/debug_report.c b/loader/debug_report.c index b04bedbb..7da370ce 100644 --- a/loader/debug_report.c +++ b/loader/debug_report.c @@ -185,7 +185,7 @@ static VKAPI_ATTR void VKAPI_CALL debug_report_DebugReportMessage( * for CreateDebugReportCallback */ -VKAPI_ATTR VkResult VKAPI_CALL loader_CreateDebugReportCallback( +VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateDebugReportCallback( VkInstance instance, const VkDebugReportCallbackCreateInfoEXT *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDebugReportCallbackEXT *pCallback) { @@ -239,9 +239,9 @@ VKAPI_ATTR VkResult VKAPI_CALL loader_CreateDebugReportCallback( * for DestroyDebugReportCallback */ VKAPI_ATTR void VKAPI_CALL -loader_DestroyDebugReportCallback(VkInstance instance, - VkDebugReportCallbackEXT callback, - const VkAllocationCallbacks *pAllocator) { +terminator_DestroyDebugReportCallback(VkInstance instance, + VkDebugReportCallbackEXT callback, + const VkAllocationCallbacks *pAllocator) { uint32_t storage_idx; VkDebugReportCallbackEXT *icd_info; const struct loader_icd *icd; @@ -263,10 +263,10 @@ loader_DestroyDebugReportCallback(VkInstance instance, * for DebugReportMessage */ VKAPI_ATTR void VKAPI_CALL -loader_DebugReportMessage(VkInstance instance, VkDebugReportFlagsEXT flags, - VkDebugReportObjectTypeEXT objType, uint64_t object, - size_t location, int32_t msgCode, - const char *pLayerPrefix, const char *pMsg) { +terminator_DebugReportMessage(VkInstance instance, VkDebugReportFlagsEXT flags, + VkDebugReportObjectTypeEXT objType, + uint64_t object, size_t location, int32_t msgCode, + const char *pLayerPrefix, const char *pMsg) { const struct loader_icd *icd; struct loader_instance *inst = (struct loader_instance *)instance; diff --git a/loader/debug_report.h b/loader/debug_report.h index 7b665a5f..baac021e 100644 --- a/loader/debug_report.h +++ b/loader/debug_report.h @@ -116,21 +116,21 @@ void debug_report_create_instance(struct loader_instance *ptr_instance, bool debug_report_instance_gpa(struct loader_instance *ptr_instance, const char *name, void **addr); -VKAPI_ATTR VkResult VKAPI_CALL loader_CreateDebugReportCallback( +VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateDebugReportCallback( VkInstance instance, const VkDebugReportCallbackCreateInfoEXT *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDebugReportCallbackEXT *pCallback); VKAPI_ATTR void VKAPI_CALL -loader_DestroyDebugReportCallback(VkInstance instance, - VkDebugReportCallbackEXT callback, - const VkAllocationCallbacks *pAllocator); +terminator_DestroyDebugReportCallback(VkInstance instance, + VkDebugReportCallbackEXT callback, + const VkAllocationCallbacks *pAllocator); VKAPI_ATTR void VKAPI_CALL -loader_DebugReportMessage(VkInstance instance, VkDebugReportFlagsEXT flags, - VkDebugReportObjectTypeEXT objType, uint64_t object, - size_t location, int32_t msgCode, - const char *pLayerPrefix, const char *pMsg); +terminator_DebugReportMessage(VkInstance instance, VkDebugReportFlagsEXT flags, + VkDebugReportObjectTypeEXT objType, + uint64_t object, size_t location, int32_t msgCode, + const char *pLayerPrefix, const char *pMsg); VkResult util_CreateDebugReportCallback(struct loader_instance *inst, diff --git a/loader/loader.c b/loader/loader.c index 93c1be9a..9f50be61 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -63,10 +63,6 @@ struct loader_struct loader = {0}; // TLS for instance for alloc/free callbacks THREAD_LOCAL_DECL struct loader_instance *tls_instance; -static bool loader_init_generic_list(const struct loader_instance *inst, - struct loader_generic_list *list_info, - size_t element_size); - static size_t loader_platform_combine_path(char *dest, size_t len, ...); struct loader_phys_dev_per_icd { @@ -98,62 +94,62 @@ const char *std_validation_str = "VK_LAYER_LUNARG_standard_validation"; // pointers to "terminator functions". const VkLayerInstanceDispatchTable instance_disp = { .GetInstanceProcAddr = vkGetInstanceProcAddr, - .DestroyInstance = loader_DestroyInstance, - .EnumeratePhysicalDevices = loader_EnumeratePhysicalDevices, - .GetPhysicalDeviceFeatures = loader_GetPhysicalDeviceFeatures, + .DestroyInstance = terminator_DestroyInstance, + .EnumeratePhysicalDevices = terminator_EnumeratePhysicalDevices, + .GetPhysicalDeviceFeatures = terminator_GetPhysicalDeviceFeatures, .GetPhysicalDeviceFormatProperties = - loader_GetPhysicalDeviceFormatProperties, + terminator_GetPhysicalDeviceFormatProperties, .GetPhysicalDeviceImageFormatProperties = - loader_GetPhysicalDeviceImageFormatProperties, - .GetPhysicalDeviceProperties = loader_GetPhysicalDeviceProperties, + terminator_GetPhysicalDeviceImageFormatProperties, + .GetPhysicalDeviceProperties = terminator_GetPhysicalDeviceProperties, .GetPhysicalDeviceQueueFamilyProperties = - loader_GetPhysicalDeviceQueueFamilyProperties, + terminator_GetPhysicalDeviceQueueFamilyProperties, .GetPhysicalDeviceMemoryProperties = - loader_GetPhysicalDeviceMemoryProperties, + terminator_GetPhysicalDeviceMemoryProperties, .EnumerateDeviceExtensionProperties = - loader_EnumerateDeviceExtensionProperties, - .EnumerateDeviceLayerProperties = loader_EnumerateDeviceLayerProperties, + terminator_EnumerateDeviceExtensionProperties, + .EnumerateDeviceLayerProperties = terminator_EnumerateDeviceLayerProperties, .GetPhysicalDeviceSparseImageFormatProperties = - loader_GetPhysicalDeviceSparseImageFormatProperties, - .DestroySurfaceKHR = loader_DestroySurfaceKHR, + terminator_GetPhysicalDeviceSparseImageFormatProperties, + .DestroySurfaceKHR = terminator_DestroySurfaceKHR, .GetPhysicalDeviceSurfaceSupportKHR = - loader_GetPhysicalDeviceSurfaceSupportKHR, + terminator_GetPhysicalDeviceSurfaceSupportKHR, .GetPhysicalDeviceSurfaceCapabilitiesKHR = - loader_GetPhysicalDeviceSurfaceCapabilitiesKHR, + terminator_GetPhysicalDeviceSurfaceCapabilitiesKHR, .GetPhysicalDeviceSurfaceFormatsKHR = - loader_GetPhysicalDeviceSurfaceFormatsKHR, + terminator_GetPhysicalDeviceSurfaceFormatsKHR, .GetPhysicalDeviceSurfacePresentModesKHR = - loader_GetPhysicalDeviceSurfacePresentModesKHR, - .CreateDebugReportCallbackEXT = loader_CreateDebugReportCallback, - .DestroyDebugReportCallbackEXT = loader_DestroyDebugReportCallback, - .DebugReportMessageEXT = loader_DebugReportMessage, + terminator_GetPhysicalDeviceSurfacePresentModesKHR, + .CreateDebugReportCallbackEXT = terminator_CreateDebugReportCallback, + .DestroyDebugReportCallbackEXT = terminator_DestroyDebugReportCallback, + .DebugReportMessageEXT = terminator_DebugReportMessage, #ifdef VK_USE_PLATFORM_MIR_KHR - .CreateMirSurfaceKHR = loader_CreateMirSurfaceKHR, + .CreateMirSurfaceKHR = terminator_CreateMirSurfaceKHR, .GetPhysicalDeviceMirPresentationSupportKHR = - loader_GetPhysicalDeviceMirPresentationSupportKHR, + terminator_GetPhysicalDeviceMirPresentationSupportKHR, #endif #ifdef VK_USE_PLATFORM_WAYLAND_KHR - .CreateWaylandSurfaceKHR = loader_CreateWaylandSurfaceKHR, + .CreateWaylandSurfaceKHR = terminator_CreateWaylandSurfaceKHR, .GetPhysicalDeviceWaylandPresentationSupportKHR = - loader_GetPhysicalDeviceWaylandPresentationSupportKHR, + terminator_GetPhysicalDeviceWaylandPresentationSupportKHR, #endif #ifdef VK_USE_PLATFORM_WIN32_KHR - .CreateWin32SurfaceKHR = loader_CreateWin32SurfaceKHR, + .CreateWin32SurfaceKHR = terminator_CreateWin32SurfaceKHR, .GetPhysicalDeviceWin32PresentationSupportKHR = - loader_GetPhysicalDeviceWin32PresentationSupportKHR, + terminator_GetPhysicalDeviceWin32PresentationSupportKHR, #endif #ifdef VK_USE_PLATFORM_XCB_KHR - .CreateXcbSurfaceKHR = loader_CreateXcbSurfaceKHR, + .CreateXcbSurfaceKHR = terminator_CreateXcbSurfaceKHR, .GetPhysicalDeviceXcbPresentationSupportKHR = - loader_GetPhysicalDeviceXcbPresentationSupportKHR, + terminator_GetPhysicalDeviceXcbPresentationSupportKHR, #endif #ifdef VK_USE_PLATFORM_XLIB_KHR - .CreateXlibSurfaceKHR = loader_CreateXlibSurfaceKHR, + .CreateXlibSurfaceKHR = terminator_CreateXlibSurfaceKHR, .GetPhysicalDeviceXlibPresentationSupportKHR = - loader_GetPhysicalDeviceXlibPresentationSupportKHR, + terminator_GetPhysicalDeviceXlibPresentationSupportKHR, #endif #ifdef VK_USE_PLATFORM_ANDROID_KHR - .CreateAndroidSurfaceKHR = loader_CreateAndroidSurfaceKHR, + .CreateAndroidSurfaceKHR = terminator_CreateAndroidSurfaceKHR, #endif }; @@ -220,7 +216,7 @@ void loader_tls_heap_free(void *pMemory) { } void loader_log(const struct loader_instance *inst, VkFlags msg_type, - int32_t msg_code, const char *format, ...) { + int32_t msg_code, const char *format, ...) { char msg[512]; va_list ap; int ret; @@ -621,10 +617,11 @@ loader_init_device_extensions(const struct loader_instance *inst, return VK_SUCCESS; } -static VkResult loader_add_device_extensions( - const struct loader_instance *inst, struct loader_icd *icd, - VkPhysicalDevice physical_device, const char *lib_name, - struct loader_extension_list *ext_list) { +VkResult loader_add_device_extensions(const struct loader_instance *inst, + struct loader_icd *icd, + VkPhysicalDevice physical_device, + const char *lib_name, + struct loader_extension_list *ext_list) { uint32_t i, count; VkResult res; VkExtensionProperties *ext_props; @@ -664,9 +661,9 @@ static VkResult loader_add_device_extensions( return VK_SUCCESS; } -static bool loader_init_generic_list(const struct loader_instance *inst, - struct loader_generic_list *list_info, - size_t element_size) { +bool loader_init_generic_list(const struct loader_instance *inst, + struct loader_generic_list *list_info, + size_t element_size) { list_info->capacity = 32 * element_size; list_info->list = loader_heap_alloc(inst, list_info->capacity, VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); @@ -1135,7 +1132,7 @@ static void loader_destroy_logical_device(const struct loader_instance *inst, loader_heap_free(inst, dev); } -static struct loader_device * +struct loader_device * loader_add_logical_device(const struct loader_instance *inst, struct loader_device **device_list) { struct loader_device *new_dev; @@ -1356,7 +1353,7 @@ static bool loader_icd_init_entrys(struct loader_icd *icd, VkInstance inst, icd->func = (PFN_vk##func)fp_gipa(inst, "vk" #func); \ if (!icd->func && required) { \ loader_log((struct loader_instance *)inst, \ - VK_DEBUG_REPORT_WARNING_BIT_EXT, 0, \ + VK_DEBUG_REPORT_WARNING_BIT_EXT, 0, \ loader_platform_get_proc_address_error("vk" #func)); \ return false; \ } \ @@ -1426,7 +1423,8 @@ static void loader_debug_init(void) { g_loader_log_msgs |= VK_DEBUG_REPORT_INFORMATION_BIT_EXT; } else if (strncmp(env, "perf", len) == 0) { g_loader_debug |= LOADER_PERF_BIT; - g_loader_log_msgs |= VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT; + g_loader_log_msgs |= + VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT; } else if (strncmp(env, "error", len) == 0) { g_loader_debug |= LOADER_ERROR_BIT; g_loader_log_msgs |= VK_DEBUG_REPORT_ERROR_BIT_EXT; @@ -1888,7 +1886,7 @@ loader_add_layer_properties(const struct loader_instance *inst, var = cJSON_GetObjectItem(node, #var); \ if (var == NULL) { \ layer_node = layer_node->next; \ - loader_log(inst, VK_DEBUG_REPORT_WARNING_BIT_EXT, 0, \ + loader_log(inst, VK_DEBUG_REPORT_WARNING_BIT_EXT, 0, \ "Didn't find required layer object %s in manifest " \ "JSON file, skipping this layer", \ #var); \ @@ -1900,7 +1898,7 @@ loader_add_layer_properties(const struct loader_instance *inst, item = cJSON_GetObjectItem(node, #var); \ if (item == NULL) { \ layer_node = layer_node->next; \ - loader_log(inst, VK_DEBUG_REPORT_WARNING_BIT_EXT, 0, \ + loader_log(inst, VK_DEBUG_REPORT_WARNING_BIT_EXT, 0, \ "Didn't find required layer value %s in manifest JSON " \ "file, skipping this layer", \ #var); \ @@ -1987,9 +1985,10 @@ loader_add_layer_properties(const struct loader_instance *inst, props->info.description[sizeof(props->info.description) - 1] = '\0'; if (is_implicit) { if (!disable_environment || !disable_environment->child) { - loader_log(inst, VK_DEBUG_REPORT_WARNING_BIT_EXT, 0, - "Didn't find required layer child value disable_environment" - "in manifest JSON file, skipping this layer"); + loader_log( + inst, VK_DEBUG_REPORT_WARNING_BIT_EXT, 0, + "Didn't find required layer child value disable_environment" + "in manifest JSON file, skipping this layer"); layer_node = layer_node->next; continue; } @@ -2360,8 +2359,8 @@ static void loader_get_manifest_files(const struct loader_instance *inst, closedir(sysdir); file = next_file; #if !defined(_WIN32) - if (home_location != NULL && (next_file == NULL || *next_file == '\0') - && override == NULL) { + if (home_location != NULL && + (next_file == NULL || *next_file == '\0') && override == NULL) { char *home = secure_getenv("HOME"); if (home != NULL) { size_t len; @@ -2369,7 +2368,7 @@ static void loader_get_manifest_files(const struct loader_instance *inst, strlen(home_location)); if (home_loc == NULL) { loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0, - "Out of memory can't get manifest files"); + "Out of memory can't get manifest files"); return; } strcpy(home_loc, home); @@ -2377,16 +2376,17 @@ static void loader_get_manifest_files(const struct loader_instance *inst, if (home_location[0] != DIRECTORY_SYMBOL) { len = strlen(home_loc); home_loc[len] = DIRECTORY_SYMBOL; - home_loc[len+1] = '\0'; + home_loc[len + 1] = '\0'; } strcat(home_loc, home_location); file = home_loc; next_file = loader_get_next_path(file); home_location = NULL; - loader_log(inst, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0, - "Searching the following paths for manifest files: %s\n", - home_loc); + loader_log( + inst, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0, + "Searching the following paths for manifest files: %s\n", + home_loc); list_is_dirs = true; } } @@ -2600,9 +2600,9 @@ loader_gpa_instance_internal(VkInstance inst, const char *pName) { if (!strcmp(pName, "vkGetInstanceProcAddr")) return (void *)loader_gpa_instance_internal; if (!strcmp(pName, "vkCreateInstance")) - return (void *)loader_CreateInstance; + return (void *)terminator_CreateInstance; if (!strcmp(pName, "vkCreateDevice")) - return (void *)loader_create_device_terminator; + return (void *)terminator_CreateDevice; // inst is not wrapped if (inst == VK_NULL_HANDLE) { @@ -2670,8 +2670,8 @@ static void loader_init_dispatch_dev_ext_entry(struct loader_instance *inst, * for dev for each of those extension entrypoints found in hash table. */ -static void loader_init_dispatch_dev_ext(struct loader_instance *inst, - struct loader_device *dev) { +void loader_init_dispatch_dev_ext(struct loader_instance *inst, + struct loader_device *dev) { for (uint32_t i = 0; i < MAX_NUM_DEV_EXTS; i++) { if (inst->disp_hash[i].func_name != NULL) loader_init_dispatch_dev_ext_entry(inst, dev, i, @@ -3260,7 +3260,7 @@ void loader_activate_instance_layer_extensions(struct loader_instance *inst, inst->disp, inst->disp->GetInstanceProcAddr, created_inst); } -static VkResult +VkResult loader_enable_device_layers(const struct loader_instance *inst, struct loader_icd *icd, struct loader_layer_list *activated_layer_list, @@ -3300,90 +3300,6 @@ loader_enable_device_layers(const struct loader_instance *inst, return err; } -VKAPI_ATTR VkResult VKAPI_CALL -loader_create_device_terminator(VkPhysicalDevice physicalDevice, - const VkDeviceCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkDevice *pDevice) { - struct loader_physical_device *phys_dev; - phys_dev = loader_get_physical_device(physicalDevice); - - VkLayerDeviceCreateInfo *chain_info = - (VkLayerDeviceCreateInfo *)pCreateInfo->pNext; - while (chain_info && - !(chain_info->sType == VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO && - chain_info->function == VK_LAYER_DEVICE_INFO)) { - chain_info = (VkLayerDeviceCreateInfo *)chain_info->pNext; - } - assert(chain_info != NULL); - - struct loader_device *dev = - (struct loader_device *)chain_info->u.deviceInfo.device_info; - PFN_vkGetInstanceProcAddr fpGetInstanceProcAddr = - chain_info->u.deviceInfo.pfnNextGetInstanceProcAddr; - PFN_vkCreateDevice fpCreateDevice = - (PFN_vkCreateDevice)fpGetInstanceProcAddr(phys_dev->this_icd->instance, - "vkCreateDevice"); - if (fpCreateDevice == NULL) { - return VK_ERROR_INITIALIZATION_FAILED; - } - - VkDeviceCreateInfo localCreateInfo; - memcpy(&localCreateInfo, pCreateInfo, sizeof(localCreateInfo)); - localCreateInfo.pNext = loader_strip_create_extensions(pCreateInfo->pNext); - - /* - * NOTE: Need to filter the extensions to only those - * supported by the ICD. - * No ICD will advertise support for layers. An ICD - * library could support a layer, but it would be - * independent of the actual ICD, just in the same library. - */ - char **filtered_extension_names = NULL; - filtered_extension_names = - loader_stack_alloc(pCreateInfo->enabledExtensionCount * sizeof(char *)); - if (!filtered_extension_names) { - return VK_ERROR_OUT_OF_HOST_MEMORY; - } - - localCreateInfo.enabledLayerCount = 0; - localCreateInfo.ppEnabledLayerNames = NULL; - - localCreateInfo.enabledExtensionCount = 0; - localCreateInfo.ppEnabledExtensionNames = - (const char *const *)filtered_extension_names; - - for (uint32_t i = 0; i < pCreateInfo->enabledExtensionCount; i++) { - const char *extension_name = pCreateInfo->ppEnabledExtensionNames[i]; - VkExtensionProperties *prop = get_extension_property( - extension_name, &phys_dev->device_extension_cache); - if (prop) { - filtered_extension_names[localCreateInfo.enabledExtensionCount] = - (char *)extension_name; - localCreateInfo.enabledExtensionCount++; - } - } - - VkDevice localDevice; - // TODO: Why does fpCreateDevice behave differently than - // this_icd->CreateDevice? - // VkResult res = fpCreateDevice(phys_dev->phys_dev, &localCreateInfo, - // pAllocator, &localDevice); - VkResult res = phys_dev->this_icd->CreateDevice( - phys_dev->phys_dev, &localCreateInfo, pAllocator, &localDevice); - - if (res != VK_SUCCESS) { - return res; - } - - *pDevice = localDevice; - - /* Init dispatch pointer in new device object */ - loader_init_dispatch(*pDevice, &dev->loader_dispatch); - - return res; -} - VkResult loader_create_device_chain(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -3645,10 +3561,88 @@ VkResult loader_validate_device_extensions( return VK_SUCCESS; } +VkResult +loader_init_physical_device_info(struct loader_instance *ptr_instance) { + struct loader_icd *icd; + uint32_t i, j, idx, count = 0; + VkResult res; + struct loader_phys_dev_per_icd *phys_devs; + + ptr_instance->total_gpu_count = 0; + phys_devs = (struct loader_phys_dev_per_icd *)loader_stack_alloc( + sizeof(struct loader_phys_dev_per_icd) * ptr_instance->total_icd_count); + if (!phys_devs) + return VK_ERROR_OUT_OF_HOST_MEMORY; + + icd = ptr_instance->icds; + for (i = 0; i < ptr_instance->total_icd_count; i++) { + assert(icd); + res = icd->EnumeratePhysicalDevices(icd->instance, &phys_devs[i].count, + NULL); + if (res != VK_SUCCESS) + return res; + count += phys_devs[i].count; + icd = icd->next; + } + + ptr_instance->phys_devs = + (struct loader_physical_device *)loader_heap_alloc( + ptr_instance, count * sizeof(struct loader_physical_device), + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); + if (!ptr_instance->phys_devs) + return VK_ERROR_OUT_OF_HOST_MEMORY; + + icd = ptr_instance->icds; + + struct loader_physical_device *inst_phys_devs = ptr_instance->phys_devs; + idx = 0; + for (i = 0; i < ptr_instance->total_icd_count; i++) { + assert(icd); + + phys_devs[i].phys_devs = (VkPhysicalDevice *)loader_stack_alloc( + phys_devs[i].count * sizeof(VkPhysicalDevice)); + if (!phys_devs[i].phys_devs) { + loader_heap_free(ptr_instance, ptr_instance->phys_devs); + ptr_instance->phys_devs = NULL; + return VK_ERROR_OUT_OF_HOST_MEMORY; + } + res = icd->EnumeratePhysicalDevices( + icd->instance, &(phys_devs[i].count), phys_devs[i].phys_devs); + if ((res == VK_SUCCESS)) { + ptr_instance->total_gpu_count += phys_devs[i].count; + for (j = 0; j < phys_devs[i].count; j++) { + + // initialize the loader's physicalDevice object + loader_set_dispatch((void *)&inst_phys_devs[idx], + ptr_instance->disp); + inst_phys_devs[idx].this_instance = ptr_instance; + inst_phys_devs[idx].this_icd = icd; + inst_phys_devs[idx].phys_dev = phys_devs[i].phys_devs[j]; + memset(&inst_phys_devs[idx].device_extension_cache, 0, + sizeof(struct loader_extension_list)); + + idx++; + } + } else { + loader_heap_free(ptr_instance, ptr_instance->phys_devs); + ptr_instance->phys_devs = NULL; + return res; + } + + icd = icd->next; + } + + return VK_SUCCESS; +} + +/** + * Terminator functions for the Instance chain + * All named terminator_<Vulakn API name> + */ VKAPI_ATTR VkResult VKAPI_CALL -loader_CreateInstance(const VkInstanceCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkInstance *pInstance) { +terminator_CreateInstance(const VkInstanceCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkInstance *pInstance) { struct loader_icd *icd; VkExtensionProperties *prop; char **filtered_extension_names = NULL; @@ -3757,8 +3751,8 @@ loader_CreateInstance(const VkInstanceCreateInfo *pCreateInfo, } VKAPI_ATTR void VKAPI_CALL -loader_DestroyInstance(VkInstance instance, - const VkAllocationCallbacks *pAllocator) { +terminator_DestroyInstance(VkInstance instance, + const VkAllocationCallbacks *pAllocator) { struct loader_instance *ptr_instance = loader_instance(instance); struct loader_icd *icds = ptr_instance->icds; struct loader_icd *next_icd; @@ -3805,84 +3799,94 @@ loader_DestroyInstance(VkInstance instance, loader_free_dev_ext_table(ptr_instance); } -VkResult -loader_init_physical_device_info(struct loader_instance *ptr_instance) { - struct loader_icd *icd; - uint32_t i, j, idx, count = 0; - VkResult res; - struct loader_phys_dev_per_icd *phys_devs; +VKAPI_ATTR VkResult VKAPI_CALL +terminator_CreateDevice(VkPhysicalDevice physicalDevice, + const VkDeviceCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkDevice *pDevice) { + struct loader_physical_device *phys_dev; + phys_dev = loader_get_physical_device(physicalDevice); - ptr_instance->total_gpu_count = 0; - phys_devs = (struct loader_phys_dev_per_icd *)loader_stack_alloc( - sizeof(struct loader_phys_dev_per_icd) * ptr_instance->total_icd_count); - if (!phys_devs) - return VK_ERROR_OUT_OF_HOST_MEMORY; + VkLayerDeviceCreateInfo *chain_info = + (VkLayerDeviceCreateInfo *)pCreateInfo->pNext; + while (chain_info && + !(chain_info->sType == VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO && + chain_info->function == VK_LAYER_DEVICE_INFO)) { + chain_info = (VkLayerDeviceCreateInfo *)chain_info->pNext; + } + assert(chain_info != NULL); - icd = ptr_instance->icds; - for (i = 0; i < ptr_instance->total_icd_count; i++) { - assert(icd); - res = icd->EnumeratePhysicalDevices(icd->instance, &phys_devs[i].count, - NULL); - if (res != VK_SUCCESS) - return res; - count += phys_devs[i].count; - icd = icd->next; + struct loader_device *dev = + (struct loader_device *)chain_info->u.deviceInfo.device_info; + PFN_vkGetInstanceProcAddr fpGetInstanceProcAddr = + chain_info->u.deviceInfo.pfnNextGetInstanceProcAddr; + PFN_vkCreateDevice fpCreateDevice = + (PFN_vkCreateDevice)fpGetInstanceProcAddr(phys_dev->this_icd->instance, + "vkCreateDevice"); + if (fpCreateDevice == NULL) { + return VK_ERROR_INITIALIZATION_FAILED; } - ptr_instance->phys_devs = - (struct loader_physical_device *)loader_heap_alloc( - ptr_instance, count * sizeof(struct loader_physical_device), - VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); - if (!ptr_instance->phys_devs) + VkDeviceCreateInfo localCreateInfo; + memcpy(&localCreateInfo, pCreateInfo, sizeof(localCreateInfo)); + localCreateInfo.pNext = loader_strip_create_extensions(pCreateInfo->pNext); + + /* + * NOTE: Need to filter the extensions to only those + * supported by the ICD. + * No ICD will advertise support for layers. An ICD + * library could support a layer, but it would be + * independent of the actual ICD, just in the same library. + */ + char **filtered_extension_names = NULL; + filtered_extension_names = + loader_stack_alloc(pCreateInfo->enabledExtensionCount * sizeof(char *)); + if (!filtered_extension_names) { return VK_ERROR_OUT_OF_HOST_MEMORY; + } - icd = ptr_instance->icds; + localCreateInfo.enabledLayerCount = 0; + localCreateInfo.ppEnabledLayerNames = NULL; - struct loader_physical_device *inst_phys_devs = ptr_instance->phys_devs; - idx = 0; - for (i = 0; i < ptr_instance->total_icd_count; i++) { - assert(icd); + localCreateInfo.enabledExtensionCount = 0; + localCreateInfo.ppEnabledExtensionNames = + (const char *const *)filtered_extension_names; - phys_devs[i].phys_devs = (VkPhysicalDevice *)loader_stack_alloc( - phys_devs[i].count * sizeof(VkPhysicalDevice)); - if (!phys_devs[i].phys_devs) { - loader_heap_free(ptr_instance, ptr_instance->phys_devs); - ptr_instance->phys_devs = NULL; - return VK_ERROR_OUT_OF_HOST_MEMORY; + for (uint32_t i = 0; i < pCreateInfo->enabledExtensionCount; i++) { + const char *extension_name = pCreateInfo->ppEnabledExtensionNames[i]; + VkExtensionProperties *prop = get_extension_property( + extension_name, &phys_dev->device_extension_cache); + if (prop) { + filtered_extension_names[localCreateInfo.enabledExtensionCount] = + (char *)extension_name; + localCreateInfo.enabledExtensionCount++; } - res = icd->EnumeratePhysicalDevices( - icd->instance, &(phys_devs[i].count), phys_devs[i].phys_devs); - if ((res == VK_SUCCESS)) { - ptr_instance->total_gpu_count += phys_devs[i].count; - for (j = 0; j < phys_devs[i].count; j++) { - - // initialize the loader's physicalDevice object - loader_set_dispatch((void *)&inst_phys_devs[idx], - ptr_instance->disp); - inst_phys_devs[idx].this_instance = ptr_instance; - inst_phys_devs[idx].this_icd = icd; - inst_phys_devs[idx].phys_dev = phys_devs[i].phys_devs[j]; - memset(&inst_phys_devs[idx].device_extension_cache, 0, - sizeof(struct loader_extension_list)); + } - idx++; - } - } else { - loader_heap_free(ptr_instance, ptr_instance->phys_devs); - ptr_instance->phys_devs = NULL; - return res; - } + VkDevice localDevice; + // TODO: Why does fpCreateDevice behave differently than + // this_icd->CreateDevice? + // VkResult res = fpCreateDevice(phys_dev->phys_dev, &localCreateInfo, + // pAllocator, &localDevice); + VkResult res = phys_dev->this_icd->CreateDevice( + phys_dev->phys_dev, &localCreateInfo, pAllocator, &localDevice); - icd = icd->next; + if (res != VK_SUCCESS) { + return res; } - return VK_SUCCESS; + *pDevice = localDevice; + + /* Init dispatch pointer in new device object */ + loader_init_dispatch(*pDevice, &dev->loader_dispatch); + + return res; } VKAPI_ATTR VkResult VKAPI_CALL -loader_EnumeratePhysicalDevices(VkInstance instance, - uint32_t *pPhysicalDeviceCount, - VkPhysicalDevice *pPhysicalDevices) { +terminator_EnumeratePhysicalDevices(VkInstance instance, + uint32_t *pPhysicalDeviceCount, + VkPhysicalDevice *pPhysicalDevices) { uint32_t i; uint32_t copy_count = 0; struct loader_instance *ptr_instance = (struct loader_instance *)instance; @@ -3912,9 +3916,8 @@ loader_EnumeratePhysicalDevices(VkInstance instance, return res; } -VKAPI_ATTR void VKAPI_CALL -loader_GetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice, - VkPhysicalDeviceProperties *pProperties) { +VKAPI_ATTR void VKAPI_CALL terminator_GetPhysicalDeviceProperties( + VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties *pProperties) { struct loader_physical_device *phys_dev = (struct loader_physical_device *)physicalDevice; struct loader_icd *icd = phys_dev->this_icd; @@ -3923,7 +3926,7 @@ loader_GetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice, icd->GetPhysicalDeviceProperties(phys_dev->phys_dev, pProperties); } -VKAPI_ATTR void VKAPI_CALL loader_GetPhysicalDeviceQueueFamilyProperties( +VKAPI_ATTR void VKAPI_CALL terminator_GetPhysicalDeviceQueueFamilyProperties( VkPhysicalDevice physicalDevice, uint32_t *pQueueFamilyPropertyCount, VkQueueFamilyProperties *pProperties) { struct loader_physical_device *phys_dev = @@ -3935,7 +3938,7 @@ VKAPI_ATTR void VKAPI_CALL loader_GetPhysicalDeviceQueueFamilyProperties( phys_dev->phys_dev, pQueueFamilyPropertyCount, pProperties); } -VKAPI_ATTR void VKAPI_CALL loader_GetPhysicalDeviceMemoryProperties( +VKAPI_ATTR void VKAPI_CALL terminator_GetPhysicalDeviceMemoryProperties( VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties *pProperties) { struct loader_physical_device *phys_dev = @@ -3947,8 +3950,8 @@ VKAPI_ATTR void VKAPI_CALL loader_GetPhysicalDeviceMemoryProperties( } VKAPI_ATTR void VKAPI_CALL -loader_GetPhysicalDeviceFeatures(VkPhysicalDevice physicalDevice, - VkPhysicalDeviceFeatures *pFeatures) { +terminator_GetPhysicalDeviceFeatures(VkPhysicalDevice physicalDevice, + VkPhysicalDeviceFeatures *pFeatures) { struct loader_physical_device *phys_dev = (struct loader_physical_device *)physicalDevice; struct loader_icd *icd = phys_dev->this_icd; @@ -3958,9 +3961,9 @@ loader_GetPhysicalDeviceFeatures(VkPhysicalDevice physicalDevice, } VKAPI_ATTR void VKAPI_CALL -loader_GetPhysicalDeviceFormatProperties(VkPhysicalDevice physicalDevice, - VkFormat format, - VkFormatProperties *pFormatInfo) { +terminator_GetPhysicalDeviceFormatProperties(VkPhysicalDevice physicalDevice, + VkFormat format, + VkFormatProperties *pFormatInfo) { struct loader_physical_device *phys_dev = (struct loader_physical_device *)physicalDevice; struct loader_icd *icd = phys_dev->this_icd; @@ -3970,7 +3973,8 @@ loader_GetPhysicalDeviceFormatProperties(VkPhysicalDevice physicalDevice, pFormatInfo); } -VKAPI_ATTR VkResult VKAPI_CALL loader_GetPhysicalDeviceImageFormatProperties( +VKAPI_ATTR VkResult VKAPI_CALL +terminator_GetPhysicalDeviceImageFormatProperties( VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkImageTiling tiling, VkImageUsageFlags usage, VkImageCreateFlags flags, VkImageFormatProperties *pImageFormatProperties) { @@ -3986,7 +3990,8 @@ VKAPI_ATTR VkResult VKAPI_CALL loader_GetPhysicalDeviceImageFormatProperties( pImageFormatProperties); } -VKAPI_ATTR void VKAPI_CALL loader_GetPhysicalDeviceSparseImageFormatProperties( +VKAPI_ATTR void VKAPI_CALL +terminator_GetPhysicalDeviceSparseImageFormatProperties( VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkSampleCountFlagBits samples, VkImageUsageFlags usage, VkImageTiling tiling, uint32_t *pNumProperties, @@ -4001,355 +4006,9 @@ VKAPI_ATTR void VKAPI_CALL loader_GetPhysicalDeviceSparseImageFormatProperties( pNumProperties, pProperties); } -VKAPI_ATTR VkResult VKAPI_CALL -loader_CreateDevice(VkPhysicalDevice physicalDevice, - const VkDeviceCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkDevice *pDevice) { - struct loader_physical_device *phys_dev; - struct loader_icd *icd; - struct loader_device *dev; - struct loader_instance *inst; - struct loader_layer_list activated_layer_list = {0}; - VkResult res; - - assert(pCreateInfo->queueCreateInfoCount >= 1); - - // TODO this only works for one physical device per instance - // once CreateDevice layer bootstrapping is done via DeviceCreateInfo - // hopefully don't need this anymore in trampoline code - phys_dev = loader_get_physical_device(physicalDevice); - icd = phys_dev->this_icd; - if (!icd) - return VK_ERROR_INITIALIZATION_FAILED; - - inst = phys_dev->this_instance; - - if (!icd->CreateDevice) { - return VK_ERROR_INITIALIZATION_FAILED; - } - - /* validate any app enabled layers are available */ - if (pCreateInfo->enabledLayerCount > 0) { - res = loader_validate_layers(inst, pCreateInfo->enabledLayerCount, - pCreateInfo->ppEnabledLayerNames, - &inst->device_layer_list); - if (res != VK_SUCCESS) { - return res; - } - } - - /* Get the physical device extensions if they haven't been retrieved yet */ - if (phys_dev->device_extension_cache.capacity == 0) { - if (!loader_init_generic_list( - inst, - (struct loader_generic_list *)&phys_dev->device_extension_cache, - sizeof(VkExtensionProperties))) { - return VK_ERROR_OUT_OF_HOST_MEMORY; - } - - res = loader_add_device_extensions( - inst, icd, phys_dev->phys_dev, - phys_dev->this_icd->this_icd_lib->lib_name, - &phys_dev->device_extension_cache); - if (res != VK_SUCCESS) { - return res; - } - } - - /* convert any meta layers to the actual layers makes a copy of layer name*/ - uint32_t saved_layer_count = pCreateInfo->enabledLayerCount; - char **saved_layer_names; - char **saved_layer_ptr; - saved_layer_names = - loader_stack_alloc(sizeof(char *) * pCreateInfo->enabledLayerCount); - for (uint32_t i = 0; i < saved_layer_count; i++) { - saved_layer_names[i] = (char *)pCreateInfo->ppEnabledLayerNames[i]; - } - saved_layer_ptr = (char **)pCreateInfo->ppEnabledLayerNames; - - loader_expand_layer_names( - inst, std_validation_str, - sizeof(std_validation_names) / sizeof(std_validation_names[0]), - std_validation_names, (uint32_t *)&pCreateInfo->enabledLayerCount, - (char ***)&pCreateInfo->ppEnabledLayerNames); - - /* fetch a list of all layers activated, explicit and implicit */ - res = loader_enable_device_layers(inst, icd, &activated_layer_list, - pCreateInfo, &inst->device_layer_list); - if (res != VK_SUCCESS) { - loader_unexpand_dev_layer_names(inst, saved_layer_count, - saved_layer_names, saved_layer_ptr, - pCreateInfo); - return res; - } - - /* make sure requested extensions to be enabled are supported */ - res = loader_validate_device_extensions(phys_dev, &activated_layer_list, - pCreateInfo); - if (res != VK_SUCCESS) { - loader_unexpand_dev_layer_names(inst, saved_layer_count, - saved_layer_names, saved_layer_ptr, - pCreateInfo); - loader_destroy_generic_list( - inst, (struct loader_generic_list *)&activated_layer_list); - return res; - } - - dev = loader_add_logical_device(inst, &icd->logical_device_list); - if (dev == NULL) { - loader_unexpand_dev_layer_names(inst, saved_layer_count, - saved_layer_names, saved_layer_ptr, - pCreateInfo); - loader_destroy_generic_list( - inst, (struct loader_generic_list *)&activated_layer_list); - return VK_ERROR_OUT_OF_HOST_MEMORY; - } - - /* move the locally filled layer list into the device, and pass ownership of - * the memory */ - dev->activated_layer_list.capacity = activated_layer_list.capacity; - dev->activated_layer_list.count = activated_layer_list.count; - dev->activated_layer_list.list = activated_layer_list.list; - memset(&activated_layer_list, 0, sizeof(activated_layer_list)); - - /* activate any layers on device chain which terminates with device*/ - res = loader_enable_device_layers(inst, icd, &dev->activated_layer_list, - pCreateInfo, &inst->device_layer_list); - if (res != VK_SUCCESS) { - loader_unexpand_dev_layer_names(inst, saved_layer_count, - saved_layer_names, saved_layer_ptr, - pCreateInfo); - loader_remove_logical_device(inst, icd, dev); - return res; - } - - res = loader_create_device_chain(physicalDevice, pCreateInfo, pAllocator, - inst, icd, dev); - if (res != VK_SUCCESS) { - loader_unexpand_dev_layer_names(inst, saved_layer_count, - saved_layer_names, saved_layer_ptr, - pCreateInfo); - loader_remove_logical_device(inst, icd, dev); - return res; - } - - *pDevice = dev->device; - - /* initialize any device extension dispatch entry's from the instance list*/ - loader_init_dispatch_dev_ext(inst, dev); - - /* initialize WSI device extensions as part of core dispatch since loader - * has - * dedicated trampoline code for these*/ - loader_init_device_extension_dispatch_table( - &dev->loader_dispatch, - dev->loader_dispatch.core_dispatch.GetDeviceProcAddr, *pDevice); - - loader_unexpand_dev_layer_names(inst, saved_layer_count, saved_layer_names, - saved_layer_ptr, pCreateInfo); - return res; -} - -/** - * Get an instance level or global level entry point address. - * @param instance - * @param pName - * @return - * If instance == NULL returns a global level functions only - * If instance is valid returns a trampoline entry point for all dispatchable - * Vulkan - * functions both core and extensions. - */ -LOADER_EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL -vkGetInstanceProcAddr(VkInstance instance, const char *pName) { - - void *addr; - - addr = globalGetProcAddr(pName); - if (instance == VK_NULL_HANDLE) { - // get entrypoint addresses that are global (no dispatchable object) - - return addr; - } else { - // if a global entrypoint return NULL - if (addr) - return NULL; - } - - struct loader_instance *ptr_instance = loader_get_instance(instance); - if (ptr_instance == NULL) - return NULL; - // Return trampoline code for non-global entrypoints including any - // extensions. - // Device extensions are returned if a layer or ICD supports the extension. - // Instance extensions are returned if the extension is enabled and the - // loader - // or someone else supports the extension - return trampolineGetProcAddr(ptr_instance, pName); -} - -/** - * Get a device level or global level entry point address. - * @param device - * @param pName - * @return - * If device is valid, returns a device relative entry point for device level - * entry points both core and extensions. - * Device relative means call down the device chain. - */ -LOADER_EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL -vkGetDeviceProcAddr(VkDevice device, const char *pName) { - void *addr; - - /* for entrypoints that loader must handle (ie non-dispatchable or create - object) - make sure the loader entrypoint is returned */ - addr = loader_non_passthrough_gdpa(pName); - if (addr) { - return addr; - } - - /* Although CreateDevice is on device chain it's dispatchable object isn't - * a VkDevice or child of VkDevice so return NULL. - */ - if (!strcmp(pName, "CreateDevice")) - return NULL; - - /* return the dispatch table entrypoint for the fastest case */ - const VkLayerDispatchTable *disp_table = *(VkLayerDispatchTable **)device; - if (disp_table == NULL) - return NULL; - - addr = loader_lookup_device_dispatch_table(disp_table, pName); - if (addr) - return addr; - - if (disp_table->GetDeviceProcAddr == NULL) - return NULL; - return disp_table->GetDeviceProcAddr(device, pName); -} - -LOADER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL -vkEnumerateInstanceExtensionProperties(const char *pLayerName, - uint32_t *pPropertyCount, - VkExtensionProperties *pProperties) { - struct loader_extension_list *global_ext_list = NULL; - struct loader_layer_list instance_layers; - struct loader_extension_list icd_extensions; - struct loader_icd_libs icd_libs; - uint32_t copy_size; - - tls_instance = NULL; - memset(&icd_extensions, 0, sizeof(icd_extensions)); - memset(&instance_layers, 0, sizeof(instance_layers)); - loader_platform_thread_once(&once_init, loader_initialize); - - /* get layer libraries if needed */ - if (pLayerName && strlen(pLayerName) != 0) { - if (vk_string_validate(MaxLoaderStringLength, pLayerName) == - VK_STRING_ERROR_NONE) { - loader_layer_scan(NULL, &instance_layers, NULL); - for (uint32_t i = 0; i < instance_layers.count; i++) { - struct loader_layer_properties *props = - &instance_layers.list[i]; - if (strcmp(props->info.layerName, pLayerName) == 0) { - global_ext_list = &props->instance_extension_list; - } - } - } else { - assert(VK_FALSE && "vkEnumerateInstanceExtensionProperties: " - "pLayerName is too long or is badly formed"); - return VK_ERROR_EXTENSION_NOT_PRESENT; - } - } else { - /* Scan/discover all ICD libraries */ - memset(&icd_libs, 0, sizeof(struct loader_icd_libs)); - loader_icd_scan(NULL, &icd_libs); - /* get extensions from all ICD's, merge so no duplicates */ - loader_get_icd_loader_instance_extensions(NULL, &icd_libs, - &icd_extensions); - loader_scanned_icd_clear(NULL, &icd_libs); - global_ext_list = &icd_extensions; - } - - if (global_ext_list == NULL) { - loader_destroy_layer_list(NULL, &instance_layers); - return VK_ERROR_LAYER_NOT_PRESENT; - } - - if (pProperties == NULL) { - *pPropertyCount = global_ext_list->count; - loader_destroy_layer_list(NULL, &instance_layers); - loader_destroy_generic_list( - NULL, (struct loader_generic_list *)&icd_extensions); - return VK_SUCCESS; - } - - copy_size = *pPropertyCount < global_ext_list->count - ? *pPropertyCount - : global_ext_list->count; - for (uint32_t i = 0; i < copy_size; i++) { - memcpy(&pProperties[i], &global_ext_list->list[i], - sizeof(VkExtensionProperties)); - } - *pPropertyCount = copy_size; - loader_destroy_generic_list(NULL, - (struct loader_generic_list *)&icd_extensions); - - if (copy_size < global_ext_list->count) { - loader_destroy_layer_list(NULL, &instance_layers); - return VK_INCOMPLETE; - } - - loader_destroy_layer_list(NULL, &instance_layers); - return VK_SUCCESS; -} - -LOADER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL -vkEnumerateInstanceLayerProperties(uint32_t *pPropertyCount, - VkLayerProperties *pProperties) { - - struct loader_layer_list instance_layer_list; - tls_instance = NULL; - - loader_platform_thread_once(&once_init, loader_initialize); - - uint32_t copy_size; - - /* get layer libraries */ - memset(&instance_layer_list, 0, sizeof(instance_layer_list)); - loader_layer_scan(NULL, &instance_layer_list, NULL); - - if (pProperties == NULL) { - *pPropertyCount = instance_layer_list.count; - loader_destroy_layer_list(NULL, &instance_layer_list); - return VK_SUCCESS; - } - - copy_size = (*pPropertyCount < instance_layer_list.count) - ? *pPropertyCount - : instance_layer_list.count; - for (uint32_t i = 0; i < copy_size; i++) { - memcpy(&pProperties[i], &instance_layer_list.list[i].info, - sizeof(VkLayerProperties)); - } - - *pPropertyCount = copy_size; - loader_destroy_layer_list(NULL, &instance_layer_list); - - if (copy_size < instance_layer_list.count) { - return VK_INCOMPLETE; - } - - return VK_SUCCESS; -} - -VKAPI_ATTR VkResult VKAPI_CALL -loader_EnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, - const char *pLayerName, - uint32_t *pPropertyCount, - VkExtensionProperties *pProperties) { +VKAPI_ATTR VkResult VKAPI_CALL terminator_EnumerateDeviceExtensionProperties( + VkPhysicalDevice physicalDevice, const char *pLayerName, + uint32_t *pPropertyCount, VkExtensionProperties *pProperties) { struct loader_physical_device *phys_dev; uint32_t copy_size; @@ -4493,9 +4152,9 @@ loader_EnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, } VKAPI_ATTR VkResult VKAPI_CALL -loader_EnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice, - uint32_t *pPropertyCount, - VkLayerProperties *pProperties) { +terminator_EnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice, + uint32_t *pPropertyCount, + VkLayerProperties *pProperties) { uint32_t copy_size; struct loader_physical_device *phys_dev; // TODO fix this, aliases physical devices diff --git a/loader/loader.h b/loader/loader.h index 345c1891..fe146890 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -38,7 +38,6 @@ #include <vulkan/vulkan.h> #include <vk_loader_platform.h> - #include <vulkan/vk_layer.h> #include <vulkan/vk_icd.h> #include <assert.h> @@ -386,8 +385,18 @@ struct loader_msg_callback_map_entry { VkDebugReportCallbackEXT loader_obj; }; +/* helper function definitions */ +void *loader_heap_alloc(const struct loader_instance *instance, size_t size, + VkSystemAllocationScope allocationScope); + +void loader_heap_free(const struct loader_instance *instance, void *pMemory); + +void *loader_tls_heap_alloc(size_t size); + +void loader_tls_heap_free(void *pMemory); + void loader_log(const struct loader_instance *inst, VkFlags msg_type, - int32_t msg_code, const char *format, ...); + int32_t msg_code, const char *format, ...); bool compare_vk_extension_properties(const VkExtensionProperties *op1, const VkExtensionProperties *op2); @@ -403,75 +412,6 @@ VkResult loader_validate_instance_extensions( const struct loader_layer_list *instance_layer, const VkInstanceCreateInfo *pCreateInfo); -/* instance layer chain termination entrypoint definitions */ -VKAPI_ATTR VkResult VKAPI_CALL -loader_CreateInstance(const VkInstanceCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkInstance *pInstance); - -VKAPI_ATTR void VKAPI_CALL -loader_DestroyInstance(VkInstance instance, - const VkAllocationCallbacks *pAllocator); - -VKAPI_ATTR VkResult VKAPI_CALL -loader_EnumeratePhysicalDevices(VkInstance instance, - uint32_t *pPhysicalDeviceCount, - VkPhysicalDevice *pPhysicalDevices); - -VKAPI_ATTR void VKAPI_CALL -loader_GetPhysicalDeviceFeatures(VkPhysicalDevice physicalDevice, - VkPhysicalDeviceFeatures *pFeatures); - -VKAPI_ATTR void VKAPI_CALL -loader_GetPhysicalDeviceFormatProperties(VkPhysicalDevice physicalDevice, - VkFormat format, - VkFormatProperties *pFormatInfo); - -VKAPI_ATTR VkResult VKAPI_CALL loader_GetPhysicalDeviceImageFormatProperties( - VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, - VkImageTiling tiling, VkImageUsageFlags usage, VkImageCreateFlags flags, - VkImageFormatProperties *pImageFormatProperties); - -VKAPI_ATTR void VKAPI_CALL loader_GetPhysicalDeviceSparseImageFormatProperties( - VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, - VkSampleCountFlagBits samples, VkImageUsageFlags usage, - VkImageTiling tiling, uint32_t *pNumProperties, - VkSparseImageFormatProperties *pProperties); - -VKAPI_ATTR void VKAPI_CALL -loader_GetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice, - VkPhysicalDeviceProperties *pProperties); - -VKAPI_ATTR VkResult VKAPI_CALL -loader_EnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, - const char *pLayerName, - uint32_t *pCount, - VkExtensionProperties *pProperties); - -VKAPI_ATTR VkResult VKAPI_CALL -loader_EnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice, - uint32_t *pCount, - VkLayerProperties *pProperties); - -VKAPI_ATTR void VKAPI_CALL loader_GetPhysicalDeviceQueueFamilyProperties( - VkPhysicalDevice physicalDevice, uint32_t *pCount, - VkQueueFamilyProperties *pProperties); - -VKAPI_ATTR void VKAPI_CALL loader_GetPhysicalDeviceMemoryProperties( - VkPhysicalDevice physicalDevice, - VkPhysicalDeviceMemoryProperties *pProperties); - -VKAPI_ATTR VkResult VKAPI_CALL -loader_create_device_terminator(VkPhysicalDevice physicalDevice, - const VkDeviceCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkDevice *pDevice); - -VKAPI_ATTR VkResult VKAPI_CALL -loader_CreateDevice(VkPhysicalDevice gpu, const VkDeviceCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, VkDevice *pDevice); - -/* helper function definitions */ void loader_initialize(void); bool has_vk_extension_property_array(const VkExtensionProperties *vk_ext_prop, const uint32_t count, @@ -483,8 +423,18 @@ VkResult loader_add_to_ext_list(const struct loader_instance *inst, struct loader_extension_list *ext_list, uint32_t prop_list_count, const VkExtensionProperties *props); +VkResult loader_add_device_extensions(const struct loader_instance *inst, + struct loader_icd *icd, + VkPhysicalDevice physical_device, + const char *lib_name, + struct loader_extension_list *ext_list); +bool loader_init_generic_list(const struct loader_instance *inst, + struct loader_generic_list *list_info, + size_t element_size); void loader_destroy_generic_list(const struct loader_instance *inst, struct loader_generic_list *list); +void loader_destroy_layer_list(const struct loader_instance *inst, + struct loader_layer_list *layer_list); void loader_delete_layer_properties(const struct loader_instance *inst, struct loader_layer_list *layer_list); void loader_expand_layer_names( @@ -514,11 +464,18 @@ void loader_layer_scan(const struct loader_instance *inst, void loader_get_icd_loader_instance_extensions( const struct loader_instance *inst, struct loader_icd_libs *icd_libs, struct loader_extension_list *inst_exts); +struct loader_physical_device * +loader_get_physical_device(const VkPhysicalDevice physdev); struct loader_icd *loader_get_icd_and_device(const VkDevice device, struct loader_device **found_dev); +void loader_init_dispatch_dev_ext(struct loader_instance *inst, + struct loader_device *dev); void *loader_dev_ext_gpa(struct loader_instance *inst, const char *funcName); void *loader_get_dev_ext_trampoline(uint32_t index); struct loader_instance *loader_get_instance(const VkInstance instance); +struct loader_device * +loader_add_logical_device(const struct loader_instance *inst, + struct loader_device **device_list); void loader_remove_logical_device(const struct loader_instance *inst, struct loader_icd *icd, struct loader_device *found_dev); @@ -535,15 +492,87 @@ VkResult loader_create_instance_chain(const VkInstanceCreateInfo *pCreateInfo, void loader_activate_instance_layer_extensions(struct loader_instance *inst, VkInstance created_inst); +VkResult +loader_enable_device_layers(const struct loader_instance *inst, + struct loader_icd *icd, + struct loader_layer_list *activated_layer_list, + const VkDeviceCreateInfo *pCreateInfo, + const struct loader_layer_list *device_layers); + +VkResult loader_create_device_chain(VkPhysicalDevice physicalDevice, + const VkDeviceCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + struct loader_instance *inst, + struct loader_icd *icd, + struct loader_device *dev); +VkResult loader_validate_device_extensions( + struct loader_physical_device *phys_dev, + const struct loader_layer_list *activated_device_layers, + const VkDeviceCreateInfo *pCreateInfo); -void *loader_heap_alloc(const struct loader_instance *instance, size_t size, - VkSystemAllocationScope allocationScope); +/* instance layer chain termination entrypoint definitions */ +VKAPI_ATTR VkResult VKAPI_CALL +terminator_CreateInstance(const VkInstanceCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkInstance *pInstance); -void loader_heap_free(const struct loader_instance *instance, void *pMemory); +VKAPI_ATTR void VKAPI_CALL +terminator_DestroyInstance(VkInstance instance, + const VkAllocationCallbacks *pAllocator); -void *loader_tls_heap_alloc(size_t size); +VKAPI_ATTR VkResult VKAPI_CALL +terminator_EnumeratePhysicalDevices(VkInstance instance, + uint32_t *pPhysicalDeviceCount, + VkPhysicalDevice *pPhysicalDevices); -void loader_tls_heap_free(void *pMemory); +VKAPI_ATTR void VKAPI_CALL +terminator_GetPhysicalDeviceFeatures(VkPhysicalDevice physicalDevice, + VkPhysicalDeviceFeatures *pFeatures); + +VKAPI_ATTR void VKAPI_CALL +terminator_GetPhysicalDeviceFormatProperties(VkPhysicalDevice physicalDevice, + VkFormat format, + VkFormatProperties *pFormatInfo); + +VKAPI_ATTR VkResult VKAPI_CALL +terminator_GetPhysicalDeviceImageFormatProperties( + VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, + VkImageTiling tiling, VkImageUsageFlags usage, VkImageCreateFlags flags, + VkImageFormatProperties *pImageFormatProperties); + +VKAPI_ATTR void VKAPI_CALL +terminator_GetPhysicalDeviceSparseImageFormatProperties( + VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, + VkSampleCountFlagBits samples, VkImageUsageFlags usage, + VkImageTiling tiling, uint32_t *pNumProperties, + VkSparseImageFormatProperties *pProperties); + +VKAPI_ATTR void VKAPI_CALL +terminator_GetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice, + VkPhysicalDeviceProperties *pProperties); + +VKAPI_ATTR VkResult VKAPI_CALL terminator_EnumerateDeviceExtensionProperties( + VkPhysicalDevice physicalDevice, const char *pLayerName, uint32_t *pCount, + VkExtensionProperties *pProperties); + +VKAPI_ATTR VkResult VKAPI_CALL +terminator_EnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice, + uint32_t *pCount, + VkLayerProperties *pProperties); + +VKAPI_ATTR void VKAPI_CALL terminator_GetPhysicalDeviceQueueFamilyProperties( + VkPhysicalDevice physicalDevice, uint32_t *pCount, + VkQueueFamilyProperties *pProperties); + +VKAPI_ATTR void VKAPI_CALL terminator_GetPhysicalDeviceMemoryProperties( + VkPhysicalDevice physicalDevice, + VkPhysicalDeviceMemoryProperties *pProperties); + +VKAPI_ATTR VkResult VKAPI_CALL +terminator_CreateDevice(VkPhysicalDevice gpu, + const VkDeviceCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkDevice *pDevice); VkStringErrorFlags vk_string_validate(const int max_length, const char *char_array); diff --git a/loader/trampoline.c b/loader/trampoline.c index dfd2c000..2a5b6d50 100644 --- a/loader/trampoline.c +++ b/loader/trampoline.c @@ -37,8 +37,204 @@ #include "loader.h" #include "debug_report.h" #include "wsi.h" +#include "gpa_helper.h" +#include "table_ops.h" + +/* Trampoline entrypoints are in this file for core Vulkan commands */ +/** + * Get an instance level or global level entry point address. + * @param instance + * @param pName + * @return + * If instance == NULL returns a global level functions only + * If instance is valid returns a trampoline entry point for all dispatchable + * Vulkan + * functions both core and extensions. + */ +LOADER_EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL +vkGetInstanceProcAddr(VkInstance instance, const char *pName) { + + void *addr; + + addr = globalGetProcAddr(pName); + if (instance == VK_NULL_HANDLE) { + // get entrypoint addresses that are global (no dispatchable object) + + return addr; + } else { + // if a global entrypoint return NULL + if (addr) + return NULL; + } + + struct loader_instance *ptr_instance = loader_get_instance(instance); + if (ptr_instance == NULL) + return NULL; + // Return trampoline code for non-global entrypoints including any + // extensions. + // Device extensions are returned if a layer or ICD supports the extension. + // Instance extensions are returned if the extension is enabled and the + // loader + // or someone else supports the extension + return trampolineGetProcAddr(ptr_instance, pName); +} + +/** + * Get a device level or global level entry point address. + * @param device + * @param pName + * @return + * If device is valid, returns a device relative entry point for device level + * entry points both core and extensions. + * Device relative means call down the device chain. + */ +LOADER_EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL +vkGetDeviceProcAddr(VkDevice device, const char *pName) { + void *addr; + + /* for entrypoints that loader must handle (ie non-dispatchable or create + object) + make sure the loader entrypoint is returned */ + addr = loader_non_passthrough_gdpa(pName); + if (addr) { + return addr; + } + + /* Although CreateDevice is on device chain it's dispatchable object isn't + * a VkDevice or child of VkDevice so return NULL. + */ + if (!strcmp(pName, "CreateDevice")) + return NULL; + + /* return the dispatch table entrypoint for the fastest case */ + const VkLayerDispatchTable *disp_table = *(VkLayerDispatchTable **)device; + if (disp_table == NULL) + return NULL; + + addr = loader_lookup_device_dispatch_table(disp_table, pName); + if (addr) + return addr; + + if (disp_table->GetDeviceProcAddr == NULL) + return NULL; + return disp_table->GetDeviceProcAddr(device, pName); +} + +LOADER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL +vkEnumerateInstanceExtensionProperties(const char *pLayerName, + uint32_t *pPropertyCount, + VkExtensionProperties *pProperties) { + struct loader_extension_list *global_ext_list = NULL; + struct loader_layer_list instance_layers; + struct loader_extension_list icd_extensions; + struct loader_icd_libs icd_libs; + uint32_t copy_size; + + tls_instance = NULL; + memset(&icd_extensions, 0, sizeof(icd_extensions)); + memset(&instance_layers, 0, sizeof(instance_layers)); + loader_platform_thread_once(&once_init, loader_initialize); + + /* get layer libraries if needed */ + if (pLayerName && strlen(pLayerName) != 0) { + if (vk_string_validate(MaxLoaderStringLength, pLayerName) == + VK_STRING_ERROR_NONE) { + loader_layer_scan(NULL, &instance_layers, NULL); + for (uint32_t i = 0; i < instance_layers.count; i++) { + struct loader_layer_properties *props = + &instance_layers.list[i]; + if (strcmp(props->info.layerName, pLayerName) == 0) { + global_ext_list = &props->instance_extension_list; + } + } + } else { + assert(VK_FALSE && "vkEnumerateInstanceExtensionProperties: " + "pLayerName is too long or is badly formed"); + return VK_ERROR_EXTENSION_NOT_PRESENT; + } + } else { + /* Scan/discover all ICD libraries */ + memset(&icd_libs, 0, sizeof(struct loader_icd_libs)); + loader_icd_scan(NULL, &icd_libs); + /* get extensions from all ICD's, merge so no duplicates */ + loader_get_icd_loader_instance_extensions(NULL, &icd_libs, + &icd_extensions); + loader_scanned_icd_clear(NULL, &icd_libs); + global_ext_list = &icd_extensions; + } + + if (global_ext_list == NULL) { + loader_destroy_layer_list(NULL, &instance_layers); + return VK_ERROR_LAYER_NOT_PRESENT; + } + + if (pProperties == NULL) { + *pPropertyCount = global_ext_list->count; + loader_destroy_layer_list(NULL, &instance_layers); + loader_destroy_generic_list( + NULL, (struct loader_generic_list *)&icd_extensions); + return VK_SUCCESS; + } + + copy_size = *pPropertyCount < global_ext_list->count + ? *pPropertyCount + : global_ext_list->count; + for (uint32_t i = 0; i < copy_size; i++) { + memcpy(&pProperties[i], &global_ext_list->list[i], + sizeof(VkExtensionProperties)); + } + *pPropertyCount = copy_size; + loader_destroy_generic_list(NULL, + (struct loader_generic_list *)&icd_extensions); + + if (copy_size < global_ext_list->count) { + loader_destroy_layer_list(NULL, &instance_layers); + return VK_INCOMPLETE; + } + + loader_destroy_layer_list(NULL, &instance_layers); + return VK_SUCCESS; +} + +LOADER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL +vkEnumerateInstanceLayerProperties(uint32_t *pPropertyCount, + VkLayerProperties *pProperties) { + + struct loader_layer_list instance_layer_list; + tls_instance = NULL; + + loader_platform_thread_once(&once_init, loader_initialize); + + uint32_t copy_size; + + /* get layer libraries */ + memset(&instance_layer_list, 0, sizeof(instance_layer_list)); + loader_layer_scan(NULL, &instance_layer_list, NULL); + + if (pProperties == NULL) { + *pPropertyCount = instance_layer_list.count; + loader_destroy_layer_list(NULL, &instance_layer_list); + return VK_SUCCESS; + } + + copy_size = (*pPropertyCount < instance_layer_list.count) + ? *pPropertyCount + : instance_layer_list.count; + for (uint32_t i = 0; i < copy_size; i++) { + memcpy(&pProperties[i], &instance_layer_list.list[i].info, + sizeof(VkLayerProperties)); + } + + *pPropertyCount = copy_size; + loader_destroy_layer_list(NULL, &instance_layer_list); + + if (copy_size < instance_layer_list.count) { + return VK_INCOMPLETE; + } + + return VK_SUCCESS; +} -/* Trampoline entrypoints */ LOADER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateInstance(const VkInstanceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -335,13 +531,164 @@ LOADER_EXPORT VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceMemoryProperties( } LOADER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL -vkCreateDevice(VkPhysicalDevice gpu, const VkDeviceCreateInfo *pCreateInfo, +vkCreateDevice(VkPhysicalDevice physicalDevice, + const VkDeviceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDevice *pDevice) { VkResult res; + struct loader_physical_device *phys_dev; + struct loader_icd *icd; + struct loader_device *dev; + struct loader_instance *inst; + struct loader_layer_list activated_layer_list = {0}; + + assert(pCreateInfo->queueCreateInfoCount >= 1); loader_platform_thread_lock_mutex(&loader_lock); - res = loader_CreateDevice(gpu, pCreateInfo, pAllocator, pDevice); + // TODO this only works for one physical device per instance + // once CreateDevice layer bootstrapping is done via DeviceCreateInfo + // hopefully don't need this anymore in trampoline code + phys_dev = loader_get_physical_device(physicalDevice); + icd = phys_dev->this_icd; + if (!icd) { + loader_platform_thread_unlock_mutex(&loader_lock); + return VK_ERROR_INITIALIZATION_FAILED; + } + + inst = phys_dev->this_instance; + + if (!icd->CreateDevice) { + loader_platform_thread_unlock_mutex(&loader_lock); + return VK_ERROR_INITIALIZATION_FAILED; + } + + /* validate any app enabled layers are available */ + if (pCreateInfo->enabledLayerCount > 0) { + res = loader_validate_layers(inst, pCreateInfo->enabledLayerCount, + pCreateInfo->ppEnabledLayerNames, + &inst->device_layer_list); + if (res != VK_SUCCESS) { + loader_platform_thread_unlock_mutex(&loader_lock); + return res; + } + } + + /* Get the physical device extensions if they haven't been retrieved yet */ + if (phys_dev->device_extension_cache.capacity == 0) { + if (!loader_init_generic_list( + inst, + (struct loader_generic_list *)&phys_dev->device_extension_cache, + sizeof(VkExtensionProperties))) { + loader_platform_thread_unlock_mutex(&loader_lock); + return VK_ERROR_OUT_OF_HOST_MEMORY; + } + + res = loader_add_device_extensions( + inst, icd, phys_dev->phys_dev, + phys_dev->this_icd->this_icd_lib->lib_name, + &phys_dev->device_extension_cache); + if (res != VK_SUCCESS) { + loader_platform_thread_unlock_mutex(&loader_lock); + return res; + } + } + + /* convert any meta layers to the actual layers makes a copy of layer name*/ + uint32_t saved_layer_count = pCreateInfo->enabledLayerCount; + char **saved_layer_names; + char **saved_layer_ptr; + saved_layer_names = + loader_stack_alloc(sizeof(char *) * pCreateInfo->enabledLayerCount); + for (uint32_t i = 0; i < saved_layer_count; i++) { + saved_layer_names[i] = (char *)pCreateInfo->ppEnabledLayerNames[i]; + } + saved_layer_ptr = (char **)pCreateInfo->ppEnabledLayerNames; + + loader_expand_layer_names( + inst, std_validation_str, + sizeof(std_validation_names) / sizeof(std_validation_names[0]), + std_validation_names, (uint32_t *)&pCreateInfo->enabledLayerCount, + (char ***)&pCreateInfo->ppEnabledLayerNames); + + /* fetch a list of all layers activated, explicit and implicit */ + res = loader_enable_device_layers(inst, icd, &activated_layer_list, + pCreateInfo, &inst->device_layer_list); + if (res != VK_SUCCESS) { + loader_unexpand_dev_layer_names(inst, saved_layer_count, + saved_layer_names, saved_layer_ptr, + pCreateInfo); + loader_platform_thread_unlock_mutex(&loader_lock); + return res; + } + + /* make sure requested extensions to be enabled are supported */ + res = loader_validate_device_extensions(phys_dev, &activated_layer_list, + pCreateInfo); + if (res != VK_SUCCESS) { + loader_unexpand_dev_layer_names(inst, saved_layer_count, + saved_layer_names, saved_layer_ptr, + pCreateInfo); + loader_destroy_generic_list( + inst, (struct loader_generic_list *)&activated_layer_list); + loader_platform_thread_unlock_mutex(&loader_lock); + return res; + } + + dev = loader_add_logical_device(inst, &icd->logical_device_list); + if (dev == NULL) { + loader_unexpand_dev_layer_names(inst, saved_layer_count, + saved_layer_names, saved_layer_ptr, + pCreateInfo); + loader_destroy_generic_list( + inst, (struct loader_generic_list *)&activated_layer_list); + loader_platform_thread_unlock_mutex(&loader_lock); + return VK_ERROR_OUT_OF_HOST_MEMORY; + } + + /* move the locally filled layer list into the device, and pass ownership of + * the memory */ + dev->activated_layer_list.capacity = activated_layer_list.capacity; + dev->activated_layer_list.count = activated_layer_list.count; + dev->activated_layer_list.list = activated_layer_list.list; + memset(&activated_layer_list, 0, sizeof(activated_layer_list)); + + /* activate any layers on device chain which terminates with device*/ + res = loader_enable_device_layers(inst, icd, &dev->activated_layer_list, + pCreateInfo, &inst->device_layer_list); + if (res != VK_SUCCESS) { + loader_unexpand_dev_layer_names(inst, saved_layer_count, + saved_layer_names, saved_layer_ptr, + pCreateInfo); + loader_remove_logical_device(inst, icd, dev); + loader_platform_thread_unlock_mutex(&loader_lock); + return res; + } + + res = loader_create_device_chain(physicalDevice, pCreateInfo, pAllocator, + inst, icd, dev); + if (res != VK_SUCCESS) { + loader_unexpand_dev_layer_names(inst, saved_layer_count, + saved_layer_names, saved_layer_ptr, + pCreateInfo); + loader_remove_logical_device(inst, icd, dev); + loader_platform_thread_unlock_mutex(&loader_lock); + return res; + } + + *pDevice = dev->device; + + /* initialize any device extension dispatch entry's from the instance list*/ + loader_init_dispatch_dev_ext(inst, dev); + + /* initialize WSI device extensions as part of core dispatch since loader + * has + * dedicated trampoline code for these*/ + loader_init_device_extension_dispatch_table( + &dev->loader_dispatch, + dev->loader_dispatch.core_dispatch.GetDeviceProcAddr, *pDevice); + + loader_unexpand_dev_layer_names(inst, saved_layer_count, saved_layer_names, + saved_layer_ptr, pCreateInfo); loader_platform_thread_unlock_mutex(&loader_lock); return res; @@ -385,7 +732,7 @@ vkEnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, res = disp->EnumerateDeviceExtensionProperties( physicalDevice, NULL, pPropertyCount, pProperties); } else { - res = loader_EnumerateDeviceExtensionProperties( + res = terminator_EnumerateDeviceExtensionProperties( physicalDevice, pLayerName, pPropertyCount, pProperties); } @@ -403,8 +750,8 @@ vkEnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice, /* Don't dispatch this call down the instance chain, want all device layers enumerated and instance chain may not contain all device layers */ - res = loader_EnumerateDeviceLayerProperties(physicalDevice, pPropertyCount, - pProperties); + res = terminator_EnumerateDeviceLayerProperties( + physicalDevice, pPropertyCount, pProperties); loader_platform_thread_unlock_mutex(&loader_lock); return res; } diff --git a/loader/wsi.c b/loader/wsi.c index e5e0140e..fe6000c9 100644 --- a/loader/wsi.c +++ b/loader/wsi.c @@ -205,8 +205,8 @@ vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, * for DestroySurfaceKHR */ VKAPI_ATTR void VKAPI_CALL -loader_DestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, - const VkAllocationCallbacks *pAllocator) { +terminator_DestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, + const VkAllocationCallbacks *pAllocator) { struct loader_instance *ptr_instance = loader_get_instance(instance); loader_heap_free(ptr_instance, (void *)surface); @@ -233,10 +233,10 @@ vkGetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice physicalDevice, * for GetPhysicalDeviceSurfaceSupportKHR */ VKAPI_ATTR VkResult VKAPI_CALL -loader_GetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice physicalDevice, - uint32_t queueFamilyIndex, - VkSurfaceKHR surface, - VkBool32 *pSupported) { +terminator_GetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice physicalDevice, + uint32_t queueFamilyIndex, + VkSurfaceKHR surface, + VkBool32 *pSupported) { struct loader_physical_device *phys_dev = (struct loader_physical_device *)physicalDevice; struct loader_icd *icd = phys_dev->this_icd; @@ -271,7 +271,8 @@ vkGetPhysicalDeviceSurfaceCapabilitiesKHR( * This is the instance chain terminator function * for GetPhysicalDeviceSurfaceCapabilitiesKHR */ -VKAPI_ATTR VkResult VKAPI_CALL loader_GetPhysicalDeviceSurfaceCapabilitiesKHR( +VKAPI_ATTR VkResult VKAPI_CALL +terminator_GetPhysicalDeviceSurfaceCapabilitiesKHR( VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) { struct loader_physical_device *phys_dev = @@ -308,11 +309,9 @@ vkGetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice physicalDevice, * This is the instance chain terminator function * for GetPhysicalDeviceSurfaceFormatsKHR */ -VKAPI_ATTR VkResult VKAPI_CALL -loader_GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice physicalDevice, - VkSurfaceKHR surface, - uint32_t *pSurfaceFormatCount, - VkSurfaceFormatKHR *pSurfaceFormats) { +VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceSurfaceFormatsKHR( + VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, + uint32_t *pSurfaceFormatCount, VkSurfaceFormatKHR *pSurfaceFormats) { struct loader_physical_device *phys_dev = (struct loader_physical_device *)physicalDevice; struct loader_icd *icd = phys_dev->this_icd; @@ -348,7 +347,8 @@ vkGetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevice physicalDevice, * This is the instance chain terminator function * for GetPhysicalDeviceSurfacePresentModesKHR */ -VKAPI_ATTR VkResult VKAPI_CALL loader_GetPhysicalDeviceSurfacePresentModesKHR( +VKAPI_ATTR VkResult VKAPI_CALL +terminator_GetPhysicalDeviceSurfacePresentModesKHR( VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t *pPresentModeCount, VkPresentModeKHR *pPresentModes) { struct loader_physical_device *phys_dev = @@ -468,10 +468,10 @@ vkCreateWin32SurfaceKHR(VkInstance instance, * for CreateWin32SurfaceKHR */ VKAPI_ATTR VkResult VKAPI_CALL -loader_CreateWin32SurfaceKHR(VkInstance instance, - const VkWin32SurfaceCreateInfoKHR *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkSurfaceKHR *pSurface) { +terminator_CreateWin32SurfaceKHR(VkInstance instance, + const VkWin32SurfaceCreateInfoKHR *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkSurfaceKHR *pSurface) { struct loader_instance *ptr_instance = loader_get_instance(instance); VkIcdSurfaceWin32 *pIcdSurface = NULL; @@ -509,7 +509,7 @@ vkGetPhysicalDeviceWin32PresentationSupportKHR(VkPhysicalDevice physicalDevice, * for GetPhysicalDeviceWin32PresentationSupportKHR */ VKAPI_ATTR VkBool32 VKAPI_CALL -loader_GetPhysicalDeviceWin32PresentationSupportKHR( +terminator_GetPhysicalDeviceWin32PresentationSupportKHR( VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex) { struct loader_physical_device *phys_dev = (struct loader_physical_device *)physicalDevice; @@ -553,10 +553,10 @@ vkCreateMirSurfaceKHR(VkInstance instance, * for CreateMirSurfaceKHR */ VKAPI_ATTR VkResult VKAPI_CALL -loader_CreateMirSurfaceKHR(VkInstance instance, - const VkMirSurfaceCreateInfoKHR *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkSurfaceKHR *pSurface) { +terminator_CreateMirSurfaceKHR(VkInstance instance, + const VkMirSurfaceCreateInfoKHR *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkSurfaceKHR *pSurface) { struct loader_instance *ptr_instance = loader_get_instance(instance); VkIcdSurfaceMir *pIcdSurface = NULL; @@ -595,7 +595,7 @@ vkGetPhysicalDeviceMirPresentationSupportKHR(VkPhysicalDevice physicalDevice, * for GetPhysicalDeviceMirPresentationSupportKHR */ VKAPI_ATTR VkBool32 VKAPI_CALL -loader_GetPhysicalDeviceMirPresentationSupportKHR( +terminator_GetPhysicalDeviceMirPresentationSupportKHR( VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, MirConnection *connection) { struct loader_physical_device *phys_dev = @@ -639,11 +639,9 @@ vkCreateWaylandSurfaceKHR(VkInstance instance, * This is the instance chain terminator function * for CreateXlibSurfaceKHR */ -VKAPI_ATTR VkResult VKAPI_CALL -loader_CreateWaylandSurfaceKHR(VkInstance instance, - const VkWaylandSurfaceCreateInfoKHR *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkSurfaceKHR *pSurface) { +VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateWaylandSurfaceKHR( + VkInstance instance, const VkWaylandSurfaceCreateInfoKHR *pCreateInfo, + const VkAllocationCallbacks *pAllocator, VkSurfaceKHR *pSurface) { struct loader_instance *ptr_instance = loader_get_instance(instance); VkIcdSurfaceWayland *pIcdSurface = NULL; @@ -682,7 +680,7 @@ vkGetPhysicalDeviceWaylandPresentationSupportKHR( * for GetPhysicalDeviceWaylandPresentationSupportKHR */ VKAPI_ATTR VkBool32 VKAPI_CALL -loader_GetPhysicalDeviceWaylandPresentationSupportKHR( +terminator_GetPhysicalDeviceWaylandPresentationSupportKHR( VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, struct wl_display *display) { struct loader_physical_device *phys_dev = @@ -727,10 +725,10 @@ vkCreateXcbSurfaceKHR(VkInstance instance, * for CreateXcbSurfaceKHR */ VKAPI_ATTR VkResult VKAPI_CALL -loader_CreateXcbSurfaceKHR(VkInstance instance, - const VkXcbSurfaceCreateInfoKHR *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkSurfaceKHR *pSurface) { +terminator_CreateXcbSurfaceKHR(VkInstance instance, + const VkXcbSurfaceCreateInfoKHR *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkSurfaceKHR *pSurface) { struct loader_instance *ptr_instance = loader_get_instance(instance); VkIcdSurfaceXcb *pIcdSurface = NULL; @@ -770,7 +768,7 @@ vkGetPhysicalDeviceXcbPresentationSupportKHR(VkPhysicalDevice physicalDevice, * for GetPhysicalDeviceXcbPresentationSupportKHR */ VKAPI_ATTR VkBool32 VKAPI_CALL -loader_GetPhysicalDeviceXcbPresentationSupportKHR( +terminator_GetPhysicalDeviceXcbPresentationSupportKHR( VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, xcb_connection_t *connection, xcb_visualid_t visual_id) { struct loader_physical_device *phys_dev = @@ -815,10 +813,10 @@ vkCreateXlibSurfaceKHR(VkInstance instance, * for CreateXlibSurfaceKHR */ VKAPI_ATTR VkResult VKAPI_CALL -loader_CreateXlibSurfaceKHR(VkInstance instance, - const VkXlibSurfaceCreateInfoKHR *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkSurfaceKHR *pSurface) { +terminator_CreateXlibSurfaceKHR(VkInstance instance, + const VkXlibSurfaceCreateInfoKHR *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkSurfaceKHR *pSurface) { struct loader_instance *ptr_instance = loader_get_instance(instance); VkIcdSurfaceXlib *pIcdSurface = NULL; @@ -857,7 +855,7 @@ vkGetPhysicalDeviceXlibPresentationSupportKHR(VkPhysicalDevice physicalDevice, * for GetPhysicalDeviceXlibPresentationSupportKHR */ VKAPI_ATTR VkBool32 VKAPI_CALL -loader_GetPhysicalDeviceXlibPresentationSupportKHR( +terminator_GetPhysicalDeviceXlibPresentationSupportKHR( VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, Display *dpy, VisualID visualID) { struct loader_physical_device *phys_dev = @@ -900,9 +898,9 @@ vkCreateAndroidSurfaceKHR(VkInstance instance, ANativeWindow *window, * for CreateAndroidSurfaceKHR */ VKAPI_ATTR VkResult VKAPI_CALL -loader_CreateAndroidSurfaceKHR(VkInstance instance, Window window, - const VkAllocationCallbacks *pAllocator, - VkSurfaceKHR *pSurface) { +terminator_CreateAndroidSurfaceKHR(VkInstance instance, Window window, + const VkAllocationCallbacks *pAllocator, + VkSurfaceKHR *pSurface) { struct loader_instance *ptr_instance = loader_get_instance(instance); VkIcdSurfaceAndroid *pIcdSurface = NULL; @@ -1024,71 +1022,67 @@ bool wsi_swapchain_instance_gpa(struct loader_instance *ptr_instance, } #endif // VK_USE_PLATFORM_MIR_KHR #ifdef VK_USE_PLATFORM_WAYLAND_KHR - /* - * Functions for the VK_KHR_wayland_surface extension: - */ - if (!strcmp("vkCreateWaylandSurfaceKHR", name)) { - *addr = ptr_instance->wsi_wayland_surface_enabled - ? (void *)vkCreateWaylandSurfaceKHR - : NULL; - return true; - } - if (!strcmp("vkGetPhysicalDeviceWaylandPresentationSupportKHR", name)) { - *addr = - ptr_instance->wsi_wayland_surface_enabled + /* + * Functions for the VK_KHR_wayland_surface extension: + */ + if (!strcmp("vkCreateWaylandSurfaceKHR", name)) { + *addr = ptr_instance->wsi_wayland_surface_enabled + ? (void *)vkCreateWaylandSurfaceKHR + : NULL; + return true; + } + if (!strcmp("vkGetPhysicalDeviceWaylandPresentationSupportKHR", name)) { + *addr = ptr_instance->wsi_wayland_surface_enabled ? (void *)vkGetPhysicalDeviceWaylandPresentationSupportKHR : NULL; - return true; - } + return true; + } #endif // VK_USE_PLATFORM_WAYLAND_KHR #ifdef VK_USE_PLATFORM_XCB_KHR - /* - * Functions for the VK_KHR_xcb_surface extension: - */ - if (!strcmp("vkCreateXcbSurfaceKHR", name)) { - *addr = ptr_instance->wsi_xcb_surface_enabled - ? (void *)vkCreateXcbSurfaceKHR - : NULL; - return true; - } - if (!strcmp("vkGetPhysicalDeviceXcbPresentationSupportKHR", name)) { - *addr = - ptr_instance->wsi_xcb_surface_enabled - ? (void *)vkGetPhysicalDeviceXcbPresentationSupportKHR - : NULL; - return true; - } + /* + * Functions for the VK_KHR_xcb_surface extension: + */ + if (!strcmp("vkCreateXcbSurfaceKHR", name)) { + *addr = ptr_instance->wsi_xcb_surface_enabled + ? (void *)vkCreateXcbSurfaceKHR + : NULL; + return true; + } + if (!strcmp("vkGetPhysicalDeviceXcbPresentationSupportKHR", name)) { + *addr = ptr_instance->wsi_xcb_surface_enabled + ? (void *)vkGetPhysicalDeviceXcbPresentationSupportKHR + : NULL; + return true; + } #endif // VK_USE_PLATFORM_XCB_KHR #ifdef VK_USE_PLATFORM_XLIB_KHR - /* - * Functions for the VK_KHR_xlib_surface extension: - */ - if (!strcmp("vkCreateXlibSurfaceKHR", name)) { - *addr = ptr_instance->wsi_xlib_surface_enabled - ? (void *)vkCreateXlibSurfaceKHR - : NULL; - return true; - } - if (!strcmp("vkGetPhysicalDeviceXlibPresentationSupportKHR", - name)) { - *addr = - ptr_instance->wsi_xlib_surface_enabled - ? (void *)vkGetPhysicalDeviceXlibPresentationSupportKHR - : NULL; - return true; - } + /* + * Functions for the VK_KHR_xlib_surface extension: + */ + if (!strcmp("vkCreateXlibSurfaceKHR", name)) { + *addr = ptr_instance->wsi_xlib_surface_enabled + ? (void *)vkCreateXlibSurfaceKHR + : NULL; + return true; + } + if (!strcmp("vkGetPhysicalDeviceXlibPresentationSupportKHR", name)) { + *addr = ptr_instance->wsi_xlib_surface_enabled + ? (void *)vkGetPhysicalDeviceXlibPresentationSupportKHR + : NULL; + return true; + } #endif // VK_USE_PLATFORM_XLIB_KHR #ifdef VK_USE_PLATFORM_ANDROID_KHR - /* - * Functions for the VK_KHR_android_surface extension: - */ - if (!strcmp("vkCreateAndroidSurfaceKHR", name)) { - *addr = ptr_instance->wsi_xlib_surface_enabled - ? (void *)vkCreateAndroidSurfaceKHR - : NULL; - return true; - } + /* + * Functions for the VK_KHR_android_surface extension: + */ + if (!strcmp("vkCreateAndroidSurfaceKHR", name)) { + *addr = ptr_instance->wsi_xlib_surface_enabled + ? (void *)vkCreateAndroidSurfaceKHR + : NULL; + return true; + } #endif // VK_USE_PLATFORM_ANDROID_KHR - return false; - } + return false; +} diff --git a/loader/wsi.h b/loader/wsi.h index c0213313..aac9f99d 100644 --- a/loader/wsi.h +++ b/loader/wsi.h @@ -38,83 +38,79 @@ void wsi_create_instance(struct loader_instance *ptr_instance, const VkInstanceCreateInfo *pCreateInfo); VKAPI_ATTR void VKAPI_CALL -loader_DestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, - const VkAllocationCallbacks *pAllocator); +terminator_DestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, + const VkAllocationCallbacks *pAllocator); VKAPI_ATTR VkResult VKAPI_CALL -loader_GetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice physicalDevice, - uint32_t queueFamilyIndex, - VkSurfaceKHR surface, - VkBool32 *pSupported); +terminator_GetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice physicalDevice, + uint32_t queueFamilyIndex, + VkSurfaceKHR surface, + VkBool32 *pSupported); -VKAPI_ATTR VkResult VKAPI_CALL loader_GetPhysicalDeviceSurfaceCapabilitiesKHR( +VKAPI_ATTR VkResult VKAPI_CALL +terminator_GetPhysicalDeviceSurfaceCapabilitiesKHR( VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities); -VKAPI_ATTR VkResult VKAPI_CALL -loader_GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice physicalDevice, - VkSurfaceKHR surface, - uint32_t *pSurfaceFormatCount, - VkSurfaceFormatKHR *pSurfaceFormats); +VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceSurfaceFormatsKHR( + VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, + uint32_t *pSurfaceFormatCount, VkSurfaceFormatKHR *pSurfaceFormats); VKAPI_ATTR VkResult VKAPI_CALL -loader_GetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevice physicalDevice, - VkSurfaceKHR surface, - uint32_t *pPresentModeCount, - VkPresentModeKHR *pPresentModes); +terminator_GetPhysicalDeviceSurfacePresentModesKHR( + VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, + uint32_t *pPresentModeCount, VkPresentModeKHR *pPresentModes); #ifdef VK_USE_PLATFORM_WIN32_KHR VKAPI_ATTR VkResult VKAPI_CALL -loader_CreateWin32SurfaceKHR(VkInstance instance, - const VkWin32SurfaceCreateInfoKHR *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkSurfaceKHR *pSurface); +terminator_CreateWin32SurfaceKHR(VkInstance instance, + const VkWin32SurfaceCreateInfoKHR *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkSurfaceKHR *pSurface); VKAPI_ATTR VkBool32 VKAPI_CALL -loader_GetPhysicalDeviceWin32PresentationSupportKHR( +terminator_GetPhysicalDeviceWin32PresentationSupportKHR( VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex); #endif #ifdef VK_USE_PLATFORM_MIR_KHR VKAPI_ATTR VkResult VKAPI_CALL -loader_CreateMirSurfaceKHR(VkInstance instance, - const VkMirSurfaceCreateInfoKHR *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkSurfaceKHR *pSurface); +terminator_CreateMirSurfaceKHR(VkInstance instance, + const VkMirSurfaceCreateInfoKHR *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkSurfaceKHR *pSurface); VKAPI_ATTR VkBool32 VKAPI_CALL -loader_GetPhysicalDeviceMirPresentationSupportKHR( +terminator_GetPhysicalDeviceMirPresentationSupportKHR( VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, MirConnection *connection); #endif #ifdef VK_USE_PLATFORM_WAYLAND_KHR -VKAPI_ATTR VkResult VKAPI_CALL -loader_CreateWaylandSurfaceKHR(VkInstance instance, - const VkWaylandSurfaceCreateInfoKHR *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkSurfaceKHR *pSurface); +VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateWaylandSurfaceKHR( + VkInstance instance, const VkWaylandSurfaceCreateInfoKHR *pCreateInfo, + const VkAllocationCallbacks *pAllocator, VkSurfaceKHR *pSurface); VKAPI_ATTR VkBool32 VKAPI_CALL -loader_GetPhysicalDeviceWaylandPresentationSupportKHR( +terminator_GetPhysicalDeviceWaylandPresentationSupportKHR( VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, struct wl_display *display); #endif #ifdef VK_USE_PLATFORM_XCB_KHR VKAPI_ATTR VkResult VKAPI_CALL -loader_CreateXcbSurfaceKHR(VkInstance instance, - const VkXcbSurfaceCreateInfoKHR *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkSurfaceKHR *pSurface); +terminator_CreateXcbSurfaceKHR(VkInstance instance, + const VkXcbSurfaceCreateInfoKHR *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkSurfaceKHR *pSurface); VKAPI_ATTR VkBool32 VKAPI_CALL -loader_GetPhysicalDeviceXcbPresentationSupportKHR( +terminator_GetPhysicalDeviceXcbPresentationSupportKHR( VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, xcb_connection_t *connection, xcb_visualid_t visual_id); #endif #ifdef VK_USE_PLATFORM_XLIB_KHR VKAPI_ATTR VkResult VKAPI_CALL -loader_CreateXlibSurfaceKHR(VkInstance instance, - const VkXlibSurfaceCreateInfoKHR *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkSurfaceKHR *pSurface); +terminator_CreateXlibSurfaceKHR(VkInstance instance, + const VkXlibSurfaceCreateInfoKHR *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkSurfaceKHR *pSurface); VKAPI_ATTR VkBool32 VKAPI_CALL -loader_GetPhysicalDeviceXlibPresentationSupportKHR( +terminator_GetPhysicalDeviceXlibPresentationSupportKHR( VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, Display *dpy, VisualID visualID); #endif |