Rebase against 83f845dfa1bb4a6ec6e8b7f65e9469dc9a8a7787

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "8c48c632fc66c8420331ed9c14f7fd3764aa8a0d"
+	echo "83f845dfa1bb4a6ec6e8b7f65e9469dc9a8a7787"
 }
 
 # Show version information

patches/winex11-Vulkan_support/0001-winex11-Specify-a-default-vulkan-driver-if-one-not-f.patch

@@ -1,8 +1,8 @@
-From 9dd1831e5104052b7ede82c15ab367102512700e Mon Sep 17 00:00:00 2001
+From 0b136c373660c249f5b92bdb8c43651fb8dd650b Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 1 Jun 2018 14:03:26 +1000
-Subject: [PATCH] winex11: Specify a default vulkan driver if one not found at
- build time
+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.
@@ -11,10 +11,10 @@ vulkan library in backports and not everybody will have this mapped.
  1 file changed, 13 insertions(+), 12 deletions(-)
 
 diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c
-index a72be33..e38d4f1 100644
+index 7eca31b..1a82f5d 100644
 --- a/dlls/winex11.drv/vulkan.c
 +++ b/dlls/winex11.drv/vulkan.c
-@@ -40,7 +40,9 @@
+@@ -39,7 +39,9 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(vulkan);
  
@@ -23,9 +23,9 @@ index a72be33..e38d4f1 100644
 +#define SONAME_LIBVULKAN ""
 +#endif
  
- typedef VkFlags VkXlibSurfaceCreateFlagsKHR;
- #define VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR 1000004000
-@@ -90,9 +92,17 @@ static void *vulkan_handle;
+ static CRITICAL_SECTION context_section;
+ static CRITICAL_SECTION_DEBUG critsect_debug =
+@@ -101,9 +103,17 @@ static void *vulkan_handle;
  
  static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context)
  {
@@ -45,7 +45,7 @@ index a72be33..e38d4f1 100644
          return TRUE;
      }
  
-@@ -574,12 +584,3 @@ const struct vulkan_funcs *get_vulkan_driver(UINT version)
+@@ -618,12 +628,3 @@ const struct vulkan_funcs *get_vulkan_driver(UINT version)
      return NULL;
  }