Roderick Colenbrander : vulkan-1: Implement vkGetInstanceProcAddr.
Alexandre Julliard
julliard at winehq.org
Wed Mar 28 16:42:44 CDT 2018
Module: wine
Branch: master
Commit: 3a6c724e904e4730adc365df03ab7a096532ed1e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a6c724e904e4730adc365df03ab7a096532ed1e
Author: Roderick Colenbrander <thunderbird2k at gmail.com>
Date: Wed Mar 28 00:20:52 2018 -0700
vulkan-1: Implement vkGetInstanceProcAddr.
Signed-off-by: Roderick Colenbrander <thunderbird2k at gmail.com>
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/vulkan-1/vulkan.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/dlls/vulkan-1/vulkan.c b/dlls/vulkan-1/vulkan.c
index fbc3d1c..6f7ab43 100644
--- a/dlls/vulkan-1/vulkan.c
+++ b/dlls/vulkan-1/vulkan.c
@@ -28,6 +28,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(vulkan);
VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *, uint32_t *, VkExtensionProperties *);
+PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance, const char *);
VkResult WINAPI vkEnumerateInstanceExtensionProperties(const char *layer_name,
uint32_t *count, VkExtensionProperties *properties)
@@ -52,8 +53,18 @@ VkResult WINAPI vkEnumerateInstanceLayerProperties(uint32_t *count,
PFN_vkVoidFunction WINAPI vkGetInstanceProcAddr(VkInstance instance, const char *name)
{
- FIXME("stub: %p %s\n", instance, debugstr_a(name));
- return NULL;
+ TRACE("%p %s\n", instance, debugstr_a(name));
+
+ if (!strcmp(name, "vkEnumerateInstanceExtensionProperties"))
+ return (PFN_vkVoidFunction)vkEnumerateInstanceExtensionProperties;
+
+ if (!strcmp(name, "vkEnumerateInstanceLayerProperties"))
+ return (PFN_vkVoidFunction)vkEnumerateInstanceLayerProperties;
+
+ if (!strcmp(name, "vkGetInstanceProcAddr"))
+ return (PFN_vkVoidFunction)vkGetInstanceProcAddr;
+
+ return wine_vkGetInstanceProcAddr(instance, name);
}
BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved)
More information about the wine-cvs
mailing list