From 26e0c08344ae07f3690893229f53e08f98abb8a4 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Thu, 28 Apr 2016 14:38:57 +0800 Subject: swapchain: refactor GetInstanceProcAddr Split command intercepting out to intercept_core_instance_command and intercept_khr_surface_command. --- layers/swapchain.cpp | 130 +++++++++++++++++++++++++++++---------------------- 1 file changed, 75 insertions(+), 55 deletions(-) (limited to 'layers/swapchain.cpp') diff --git a/layers/swapchain.cpp b/layers/swapchain.cpp index 0f49cac3..b7dfad14 100644 --- a/layers/swapchain.cpp +++ b/layers/swapchain.cpp @@ -2133,6 +2133,12 @@ VKAPI_ATTR VkResult VKAPI_CALL EnumerateDeviceExtensionProperties(VkPhysicalDevi return my_data->instance_dispatch_table->EnumerateDeviceExtensionProperties(physicalDevice, NULL, pCount, pProperties); } +static PFN_vkVoidFunction +intercept_core_instance_command(const char *name); + +static PFN_vkVoidFunction +intercept_khr_surface_command(const char *name, VkInstance instance); + static PFN_vkVoidFunction intercept_core_device_command(const char *name); @@ -2161,26 +2167,9 @@ VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL GetDeviceProcAddr(VkDevice device, cons } VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL GetInstanceProcAddr(VkInstance instance, const char *funcName) { - if (!strcmp("vkGetInstanceProcAddr", funcName)) - return (PFN_vkVoidFunction)GetInstanceProcAddr; - if (!strcmp(funcName, "vkCreateInstance")) - return (PFN_vkVoidFunction)CreateInstance; - if (!strcmp(funcName, "vkDestroyInstance")) - return (PFN_vkVoidFunction)DestroyInstance; - if (!strcmp(funcName, "vkCreateDevice")) - return (PFN_vkVoidFunction)CreateDevice; - if (!strcmp(funcName, "vkEnumeratePhysicalDevices")) - return (PFN_vkVoidFunction)EnumeratePhysicalDevices; - if (!strcmp(funcName, "vkEnumerateInstanceLayerProperties")) - return (PFN_vkVoidFunction)vkEnumerateInstanceLayerProperties; - if (!strcmp(funcName, "vkEnumerateDeviceLayerProperties")) - return (PFN_vkVoidFunction)vkEnumerateDeviceLayerProperties; - if (!strcmp(funcName, "vkEnumerateInstanceExtensionProperties")) - return (PFN_vkVoidFunction)vkEnumerateInstanceExtensionProperties; - if (!strcmp(funcName, "vkEnumerateDeviceExtensionProperties")) - return (PFN_vkVoidFunction)EnumerateDeviceExtensionProperties; - if (!strcmp(funcName, "vkGetPhysicalDeviceQueueFamilyProperties")) - return (PFN_vkVoidFunction)GetPhysicalDeviceQueueFamilyProperties; + PFN_vkVoidFunction proc = intercept_core_instance_command(funcName); + if (proc) + return proc; if (instance == VK_NULL_HANDLE) { return NULL; @@ -2196,54 +2185,85 @@ VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL GetInstanceProcAddr(VkInstance instance return addr; } + proc = intercept_khr_surface_command(funcName, instance); + if (proc) + return proc; + + if (pTable->GetInstanceProcAddr == NULL) + return NULL; + return pTable->GetInstanceProcAddr(instance, funcName); +} + +static PFN_vkVoidFunction +intercept_core_instance_command(const char *name) { + static const struct { + const char *name; + PFN_vkVoidFunction proc; + } core_instance_commands[] = { + { "vkGetInstanceProcAddr", reinterpret_cast(GetInstanceProcAddr) }, + { "vkCreateInstance", reinterpret_cast(CreateInstance) }, + { "vkDestroyInstance", reinterpret_cast(DestroyInstance) }, + { "vkCreateDevice", reinterpret_cast(CreateDevice) }, + { "vkEnumeratePhysicalDevices", reinterpret_cast(EnumeratePhysicalDevices) }, + { "vkEnumerateInstanceLayerProperties", reinterpret_cast(vkEnumerateInstanceLayerProperties) }, + { "vkEnumerateDeviceLayerProperties", reinterpret_cast(vkEnumerateDeviceLayerProperties) }, + { "vkEnumerateInstanceExtensionProperties", reinterpret_cast(vkEnumerateInstanceExtensionProperties) }, + { "vkEnumerateDeviceExtensionProperties", reinterpret_cast(EnumerateDeviceExtensionProperties) }, + { "vkGetPhysicalDeviceQueueFamilyProperties", reinterpret_cast(GetPhysicalDeviceQueueFamilyProperties) }, + }; + + for (size_t i = 0; i < ARRAY_SIZE(core_instance_commands); i++) { + if (!strcmp(core_instance_commands[i].name, name)) + return core_instance_commands[i].proc; + } + + return nullptr; +} + +static PFN_vkVoidFunction +intercept_khr_surface_command(const char *name, VkInstance instance) { + static const struct { + const char *name; + PFN_vkVoidFunction proc; + } khr_surface_commands[] = { #ifdef VK_USE_PLATFORM_ANDROID_KHR - if (!strcmp("vkCreateAndroidSurfaceKHR", funcName)) - return reinterpret_cast(CreateAndroidSurfaceKHR); + { "vkCreateAndroidSurfaceKHR", reinterpret_cast(CreateAndroidSurfaceKHR) }, #endif // VK_USE_PLATFORM_ANDROID_KHR #ifdef VK_USE_PLATFORM_MIR_KHR - if (!strcmp("vkCreateMirSurfaceKHR", funcName)) - return reinterpret_cast(CreateMirSurfaceKHR); - if (!strcmp("vkGetPhysicalDeviceMirPresentationSupportKHR", funcName)) - return reinterpret_cast(GetPhysicalDeviceMirPresentationSupportKHR); + { "vkCreateMirSurfaceKHR", reinterpret_cast(CreateMirSurfaceKHR) }, + { "vkGetPhysicalDeviceMirPresentationSupportKHR", reinterpret_cast(GetPhysicalDeviceMirPresentationSupportKHR) }, #endif // VK_USE_PLATFORM_MIR_KHR #ifdef VK_USE_PLATFORM_WAYLAND_KHR - if (!strcmp("vkCreateWaylandSurfaceKHR", funcName)) - return reinterpret_cast(CreateWaylandSurfaceKHR); - if (!strcmp("vkGetPhysicalDeviceWaylandPresentationSupportKHR", funcName)) - return reinterpret_cast(GetPhysicalDeviceWaylandPresentationSupportKHR); + { "vkCreateWaylandSurfaceKHR", reinterpret_cast(CreateWaylandSurfaceKHR) }, + { "vkGetPhysicalDeviceWaylandPresentationSupportKHR", reinterpret_cast(GetPhysicalDeviceWaylandPresentationSupportKHR) }, #endif // VK_USE_PLATFORM_WAYLAND_KHR #ifdef VK_USE_PLATFORM_WIN32_KHR - if (!strcmp("vkCreateWin32SurfaceKHR", funcName)) - return reinterpret_cast(CreateWin32SurfaceKHR); - if (!strcmp("vkGetPhysicalDeviceWin32PresentationSupportKHR", funcName)) - return reinterpret_cast(GetPhysicalDeviceWin32PresentationSupportKHR); + { "vkCreateWin32SurfaceKHR", reinterpret_cast(CreateWin32SurfaceKHR) }, + { "vkGetPhysicalDeviceWin32PresentationSupportKHR", reinterpret_cast(GetPhysicalDeviceWin32PresentationSupportKHR) }, #endif // VK_USE_PLATFORM_WIN32_KHR #ifdef VK_USE_PLATFORM_XCB_KHR - if (!strcmp("vkCreateXcbSurfaceKHR", funcName)) - return reinterpret_cast(CreateXcbSurfaceKHR); - if (!strcmp("vkGetPhysicalDeviceXcbPresentationSupportKHR", funcName)) - return reinterpret_cast(GetPhysicalDeviceXcbPresentationSupportKHR); + { "vkCreateXcbSurfaceKHR", reinterpret_cast(CreateXcbSurfaceKHR) }, + { "vkGetPhysicalDeviceXcbPresentationSupportKHR", reinterpret_cast(GetPhysicalDeviceXcbPresentationSupportKHR) }, #endif // VK_USE_PLATFORM_XCB_KHR #ifdef VK_USE_PLATFORM_XLIB_KHR - if (!strcmp("vkCreateXlibSurfaceKHR", funcName)) - return reinterpret_cast(CreateXlibSurfaceKHR); - if (!strcmp("vkGetPhysicalDeviceXlibPresentationSupportKHR", funcName)) - return reinterpret_cast(GetPhysicalDeviceXlibPresentationSupportKHR); + { "vkCreateXlibSurfaceKHR", reinterpret_cast(CreateXlibSurfaceKHR) }, + { "vkGetPhysicalDeviceXlibPresentationSupportKHR", reinterpret_cast(GetPhysicalDeviceXlibPresentationSupportKHR) }, #endif // VK_USE_PLATFORM_XLIB_KHR - if (!strcmp("vkDestroySurfaceKHR", funcName)) - return reinterpret_cast(DestroySurfaceKHR); - if (!strcmp("vkGetPhysicalDeviceSurfaceSupportKHR", funcName)) - return reinterpret_cast(GetPhysicalDeviceSurfaceSupportKHR); - if (!strcmp("vkGetPhysicalDeviceSurfaceCapabilitiesKHR", funcName)) - return reinterpret_cast(GetPhysicalDeviceSurfaceCapabilitiesKHR); - if (!strcmp("vkGetPhysicalDeviceSurfaceFormatsKHR", funcName)) - return reinterpret_cast(GetPhysicalDeviceSurfaceFormatsKHR); - if (!strcmp("vkGetPhysicalDeviceSurfacePresentModesKHR", funcName)) - return reinterpret_cast(GetPhysicalDeviceSurfacePresentModesKHR); + { "vkDestroySurfaceKHR", reinterpret_cast(DestroySurfaceKHR) }, + { "vkGetPhysicalDeviceSurfaceSupportKHR", reinterpret_cast(GetPhysicalDeviceSurfaceSupportKHR) }, + { "vkGetPhysicalDeviceSurfaceCapabilitiesKHR", reinterpret_cast(GetPhysicalDeviceSurfaceCapabilitiesKHR) }, + { "vkGetPhysicalDeviceSurfaceFormatsKHR", reinterpret_cast(GetPhysicalDeviceSurfaceFormatsKHR) }, + { "vkGetPhysicalDeviceSurfacePresentModesKHR", reinterpret_cast(GetPhysicalDeviceSurfacePresentModesKHR) }, + }; - if (pTable->GetInstanceProcAddr == NULL) - return NULL; - return pTable->GetInstanceProcAddr(instance, funcName); + // do not check if VK_KHR_*_surface is enabled (why?) + + for (size_t i = 0; i < ARRAY_SIZE(khr_surface_commands); i++) { + if (!strcmp(khr_surface_commands[i].name, name)) + return khr_surface_commands[i].proc; + } + + return nullptr; } static PFN_vkVoidFunction -- cgit v1.2.3