From 2cc42fa7290d6501039513e5c0b3421f59809f2d Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 23 Feb 2024 18:11:24 +1100 Subject: [PATCH] Removed winex11-Vulkan_support patchset Debian Jessie is no longer supported. So this patch is no longer required. --- ...a-default-vulkan-driver-if-one-not-f.patch | 82 ------------------- patches/winex11-Vulkan_support/definition | 1 - 2 files changed, 83 deletions(-) delete mode 100644 patches/winex11-Vulkan_support/0001-winex11-Specify-a-default-vulkan-driver-if-one-not-f.patch delete mode 100644 patches/winex11-Vulkan_support/definition diff --git a/patches/winex11-Vulkan_support/0001-winex11-Specify-a-default-vulkan-driver-if-one-not-f.patch b/patches/winex11-Vulkan_support/0001-winex11-Specify-a-default-vulkan-driver-if-one-not-f.patch deleted file mode 100644 index cadce12e..00000000 --- a/patches/winex11-Vulkan_support/0001-winex11-Specify-a-default-vulkan-driver-if-one-not-f.patch +++ /dev/null @@ -1,82 +0,0 @@ -From b6c918acf5996c494bece9efb1439fe00b81a274 Mon Sep 17 00:00:00 2001 -From: Alistair Leslie-Hughes -Date: Fri, 1 Jun 2018 14:03:26 +1000 -Subject: [PATCH] winex11: Specify a default vulkan driver if one not found at - build time - -We cannot specify it as a dependency since Debian Jessie has the -vulkan library in backports and not everybody will have this mapped. ---- - dlls/winex11.drv/vulkan.c | 38 ++++++++++++++++---------------------- - 1 file changed, 16 insertions(+), 22 deletions(-) - -diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c -index f4fe202dfaf..1768444b2e5 100644 ---- a/dlls/winex11.drv/vulkan.c -+++ b/dlls/winex11.drv/vulkan.c -@@ -40,10 +40,12 @@ - #include "wine/vulkan_driver.h" - - WINE_DEFAULT_DEBUG_CHANNEL(vulkan); -- --#ifdef SONAME_LIBVULKAN - WINE_DECLARE_DEBUG_CHANNEL(fps); - -+#ifndef SONAME_LIBVULKAN -+#define SONAME_LIBVULKAN "" -+#endif -+ - static pthread_mutex_t vulkan_mutex; - - static XContext vulkan_hwnd_context; -@@ -104,14 +106,23 @@ static void *vulkan_handle; - - static void wine_vk_init(void) - { -- init_recursive_mutex(&vulkan_mutex); -+ const char *libvulkan_candidates[] = {SONAME_LIBVULKAN, -+ "libvulkan.so.1", -+ "libvulkan.so", -+ NULL}; -+ int i; - -- if (!(vulkan_handle = dlopen(SONAME_LIBVULKAN, RTLD_NOW))) -+ for (i=0; libvulkan_candidates[i] && !vulkan_handle; i++) -+ vulkan_handle = dlopen(libvulkan_candidates[i], RTLD_NOW); -+ -+ if (!vulkan_handle) - { -- ERR("Failed to load %s.\n", SONAME_LIBVULKAN); -+ ERR("Failed to load vulkan library\n"); - return; - } - -+ init_recursive_mutex(&vulkan_mutex); -+ - #define LOAD_FUNCPTR(f) if (!(p##f = dlsym(vulkan_handle, #f))) goto fail - #define LOAD_OPTIONAL_FUNCPTR(f) p##f = dlsym(vulkan_handle, #f) - LOAD_FUNCPTR(vkCreateInstance); -@@ -731,20 +742,3 @@ const struct vulkan_funcs *get_vulkan_driver(UINT version) - return NULL; - } - --#else /* No vulkan */ -- --const struct vulkan_funcs *get_vulkan_driver(UINT version) --{ -- ERR("Wine was built without Vulkan support.\n"); -- return NULL; --} -- --void wine_vk_surface_destroy(HWND hwnd) --{ --} -- --void vulkan_thread_detach(void) --{ --} -- --#endif /* SONAME_LIBVULKAN */ --- -2.35.1 - diff --git a/patches/winex11-Vulkan_support/definition b/patches/winex11-Vulkan_support/definition deleted file mode 100644 index e99592c9..00000000 --- a/patches/winex11-Vulkan_support/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [44775] Allow vulkan support to be detected at runtime.