From 2b85113f61298c84e3ad53729c3d45fbbc837abb Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sat, 14 Jul 2018 11:41:23 +1000 Subject: [PATCH] Rebase against 414fe80aebe3850fd016da5cb883f4bfeab1c543 --- patches/patchinstall.sh | 2 +- ...cify-a-default-vulkan-driver-if-one-not-f.patch | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index e8c1613c..15a7c623 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "053a7e225c8190fd7416b3f3c3186f1ac230eeb3" + echo "414fe80aebe3850fd016da5cb883f4bfeab1c543" } # Show version information 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 index bae3ff61..679d7d8e 100644 --- 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 @@ -1,4 +1,4 @@ -From 48056059960a8b489d195ae102a664a60242e43d Mon Sep 17 00:00:00 2001 +From 04c44a9f85dc3d28e68c15e910752882e7e9e91c 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 @@ -11,10 +11,10 @@ vulkan library in backports and not everybody will have this mapped. 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c -index fdb858d93f9..1a82f5d14dc 100644 +index 58c08ad8180..ea03a2c842f 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c -@@ -39,7 +39,9 @@ +@@ -42,7 +42,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); @@ -25,7 +25,7 @@ index fdb858d93f9..1a82f5d14dc 100644 static CRITICAL_SECTION context_section; static CRITICAL_SECTION_DEBUG critsect_debug = -@@ -101,9 +103,17 @@ static void *vulkan_handle; +@@ -107,9 +109,17 @@ static void *vulkan_handle; static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) { @@ -40,12 +40,12 @@ index fdb858d93f9..1a82f5d14dc 100644 + + if (!vulkan_handle) { -- ERR("Failed to load %s\n", SONAME_LIBVULKAN); +- ERR("Failed to load %s.\n", SONAME_LIBVULKAN); + ERR("Failed to load vulkan library\n"); return TRUE; } -@@ -618,16 +628,3 @@ const struct vulkan_funcs *get_vulkan_driver(UINT version) +@@ -666,16 +676,3 @@ const struct vulkan_funcs *get_vulkan_driver(UINT version) return NULL; } @@ -63,5 +63,5 @@ index fdb858d93f9..1a82f5d14dc 100644 - -#endif /* SONAME_LIBVULKAN */ -- -2.17.1 +2.18.0