Rebase against be12c5bc4f189901541fdca41da267f8a0ef873d.

patches/vulkan-Vulkan_Implementation/0001-vulkan-Initial-implementation.patch

@@ -1,4 +1,4 @@
-From 0da9aff4d35c89ec2c03effe12e93ef164710b20 Mon Sep 17 00:00:00 2001
+From 00e6b5dee992743569981db6621fcc5e6956ae52 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 19 Mar 2016 00:42:10 +0100
 Subject: vulkan: Initial implementation. (v2)
@@ -22,7 +22,7 @@ Subject: vulkan: Initial implementation. (v2)
  create mode 100644 dlls/vulkan/vulkan_thunks.c
 
 diff --git a/configure.ac b/configure.ac
-index fa27a6c132..b0e9ea40e1 100644
+index e8710d0dbbb..b0b58ba60b6 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -81,6 +81,8 @@ AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xco
@@ -34,7 +34,7 @@ index fa27a6c132..b0e9ea40e1 100644
  AC_ARG_WITH(xinerama,  AS_HELP_STRING([--without-xinerama],[do not use Xinerama (multi-monitor support)]),
              [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xinerama_h=no; fi])
  AC_ARG_WITH(xinput,    AS_HELP_STRING([--without-xinput],[do not use the Xinput extension]),
-@@ -992,6 +994,7 @@ then
+@@ -991,6 +993,7 @@ then
  
      dnl *** All of the following tests require X11/Xlib.h
      AC_CHECK_HEADERS([X11/Xlib.h \
@@ -42,7 +42,7 @@ index fa27a6c132..b0e9ea40e1 100644
                        X11/XKBlib.h \
                        X11/Xutil.h \
                        X11/Xcursor/Xcursor.h \
-@@ -1115,6 +1118,14 @@ then
+@@ -1114,6 +1117,14 @@ then
          WINE_NOTICE_WITH(xcomposite,[test "x$ac_cv_lib_soname_Xcomposite" = "x"],
                           [libxcomposite ${notice_platform}development files not found, Xcomposite won't be supported.])
  
@@ -57,9 +57,9 @@ index fa27a6c132..b0e9ea40e1 100644
          dnl *** Check for XICCallback struct
          AC_CHECK_MEMBERS([XICCallback.callback, XEvent.xcookie],,,
  [#ifdef HAVE_X11_XLIB_H
-@@ -1167,6 +1178,9 @@ without X support, which probably isn't what you want. You will need
- to install ${notice_platform}development packages of Xlib/Xfree86 at the very least.],
- [enable_winex11_drv])
+@@ -1175,6 +1186,9 @@ else
+                      [enable_winex11_drv])
+ fi
  
 +test "x$X_LIBS" = "x" && enable_vulkan=${enable_vulkan:-no}
 +test "x$X_LIBS" = "x" && enable_vulkan_1=${enable_vulkan_1:-no}
@@ -67,7 +67,7 @@ index fa27a6c132..b0e9ea40e1 100644
  dnl **** Check for OpenCL ****
  if test "$ac_cv_header_CL_cl_h" = "yes"
  then
-@@ -3446,6 +3460,8 @@ WINE_CONFIG_DLL(vnbt.vxd,enable_win16)
+@@ -3484,6 +3498,8 @@ WINE_CONFIG_DLL(vnbt.vxd,enable_win16)
  WINE_CONFIG_DLL(vnetbios.vxd,enable_win16)
  WINE_CONFIG_DLL(vssapi)
  WINE_CONFIG_DLL(vtdapi.vxd,enable_win16)
@@ -78,14 +78,14 @@ index fa27a6c132..b0e9ea40e1 100644
  WINE_CONFIG_DLL(w32sys.dll16,enable_win16)
 diff --git a/dlls/vulkan-1/Makefile.in b/dlls/vulkan-1/Makefile.in
 new file mode 100644
-index 0000000000..4960141473
+index 00000000000..4960141473b
 --- /dev/null
 +++ b/dlls/vulkan-1/Makefile.in
 @@ -0,0 +1 @@
 +MODULE    = vulkan-1.dll
 diff --git a/dlls/vulkan-1/vulkan-1.spec b/dlls/vulkan-1/vulkan-1.spec
 new file mode 100644
-index 0000000000..51bcfff1fd
+index 00000000000..51bcfff1fd0
 --- /dev/null
 +++ b/dlls/vulkan-1/vulkan-1.spec
 @@ -0,0 +1,160 @@
@@ -251,7 +251,7 @@ index 0000000000..51bcfff1fd
 +@ stdcall vkWaitForFences(ptr long ptr long int64) vulkan.vkWaitForFences
 diff --git a/dlls/vulkan/Makefile.in b/dlls/vulkan/Makefile.in
 new file mode 100644
-index 0000000000..7ee6d18cbe
+index 00000000000..7ee6d18cbe5
 --- /dev/null
 +++ b/dlls/vulkan/Makefile.in
 @@ -0,0 +1,8 @@
@@ -265,7 +265,7 @@ index 0000000000..7ee6d18cbe
 +	vulkan_thunks.c
 diff --git a/dlls/vulkan/vulkan.spec b/dlls/vulkan/vulkan.spec
 new file mode 100644
-index 0000000000..9b689adc20
+index 00000000000..9b689adc20c
 --- /dev/null
 +++ b/dlls/vulkan/vulkan.spec
 @@ -0,0 +1,160 @@
@@ -431,7 +431,7 @@ index 0000000000..9b689adc20
 +@ stdcall vkWaitForFences(ptr long ptr long int64)
 diff --git a/dlls/vulkan/vulkan_main.c b/dlls/vulkan/vulkan_main.c
 new file mode 100644
-index 0000000000..b060dc258c
+index 00000000000..b060dc258c7
 --- /dev/null
 +++ b/dlls/vulkan/vulkan_main.c
 @@ -0,0 +1,328 @@
@@ -765,7 +765,7 @@ index 0000000000..b060dc258c
 +}
 diff --git a/dlls/vulkan/vulkan_private.h b/dlls/vulkan/vulkan_private.h
 new file mode 100644
-index 0000000000..0f85854d25
+index 00000000000..0f85854d256
 --- /dev/null
 +++ b/dlls/vulkan/vulkan_private.h
 @@ -0,0 +1,3296 @@
@@ -4067,7 +4067,7 @@ index 0000000000..0f85854d25
 +#endif /* __VULKAN_PRIVATE_H */
 diff --git a/dlls/vulkan/vulkan_thunks.c b/dlls/vulkan/vulkan_thunks.c
 new file mode 100644
-index 0000000000..8af28e7ce3
+index 00000000000..8af28e7ce3a
 --- /dev/null
 +++ b/dlls/vulkan/vulkan_thunks.c
 @@ -0,0 +1,6593 @@
@@ -10665,5 +10665,5 @@ index 0000000000..8af28e7ce3
 +    libvulkan_handle = NULL;
 +}
 -- 
-2.11.0
+2.12.2