Module: wine Branch: master Commit: 1cc6b4921a21de5a3ccb8a4443a8ceac8a23187f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cc6b4921a21de5a3ccb8a444...
Author: Jacek Caban jacek@codeweavers.com Date: Wed Apr 14 17:58:21 2021 +0200
winevulkan: Remove native_vkGetInstanceProcAddrWINE.
It was needed for use cases like DXVK winelib builds. It was never really adopted and it's problematic for PE builds.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan.c | 14 -------------- dlls/winevulkan/winevulkan.spec | 1 - 3 files changed, 16 deletions(-)
diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index f090095a89b..fcb5c4610f2 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2684,7 +2684,6 @@ class VkGenerator(object): f.write("@ stdcall -private vk_icdGetInstanceProcAddr(ptr str) wine_vk_icdGetInstanceProcAddr\n") f.write("@ stdcall -private vk_icdGetPhysicalDeviceProcAddr(ptr str) wine_vk_icdGetPhysicalDeviceProcAddr\n") f.write("@ stdcall -private vk_icdNegotiateLoaderICDInterfaceVersion(ptr) wine_vk_icdNegotiateLoaderICDInterfaceVersion\n") - f.write("@ cdecl -norelay native_vkGetInstanceProcAddrWINE(ptr str)\n")
# Export symbols for all Vulkan Core functions. for func in self.registry.funcs.values(): diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 45beea97240..8f65da35f52 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1972,17 +1972,3 @@ VkResult WINAPI wine_vkDebugMarkerSetObjectNameEXT(VkDevice device, const VkDebu
return thunk_vkDebugMarkerSetObjectNameEXT(device, &wine_name_info); } - -/* - * Wrapper around driver vkGetInstanceProcAddr implementation. - * Allows winelib applications to access Vulkan functions with Wine - * additions and native ABI. - */ -void *native_vkGetInstanceProcAddrWINE(VkInstance instance, const char *name) -{ - wine_vk_init_once(); - if (!vk_funcs) - return NULL; - - return vk_funcs->p_vkGetInstanceProcAddr(instance, name); -} diff --git a/dlls/winevulkan/winevulkan.spec b/dlls/winevulkan/winevulkan.spec index b9644ac41bb..cad282b1978 100644 --- a/dlls/winevulkan/winevulkan.spec +++ b/dlls/winevulkan/winevulkan.spec @@ -11,7 +11,6 @@ @ stdcall -private vk_icdGetInstanceProcAddr(ptr str) wine_vk_icdGetInstanceProcAddr @ stdcall -private vk_icdGetPhysicalDeviceProcAddr(ptr str) wine_vk_icdGetPhysicalDeviceProcAddr @ stdcall -private vk_icdNegotiateLoaderICDInterfaceVersion(ptr) wine_vk_icdNegotiateLoaderICDInterfaceVersion -@ cdecl -norelay native_vkGetInstanceProcAddrWINE(ptr str) @ stdcall -private wine_vkAcquireNextImage2KHR(ptr ptr ptr) @ stdcall -private wine_vkAcquireNextImageKHR(ptr int64 int64 int64 int64 ptr) @ stdcall -private wine_vkAllocateCommandBuffers(ptr ptr ptr)