diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 743bd5d4..24dfafc3 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,13 +52,13 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "4eaaf06ce4e5d7424eec2cf303c8256610544b39" + echo "be12c5bc4f189901541fdca41da267f8a0ef873d" } # Show version information version() { - echo "Wine Staging 2.8" + echo "Wine Staging 2.9 (unreleased)" echo "Copyright (C) 2014-2017 the Wine Staging project authors." echo "" echo "Patchset to be applied on upstream Wine:" diff --git a/patches/vulkan-Vulkan_Implementation/0001-vulkan-Initial-implementation.patch b/patches/vulkan-Vulkan_Implementation/0001-vulkan-Initial-implementation.patch index c479a7a0..7a928f7d 100644 --- a/patches/vulkan-Vulkan_Implementation/0001-vulkan-Initial-implementation.patch +++ b/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 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 diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index 1b647ee2..a6550088 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -865,7 +865,7 @@ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c -@@ -1207,7 +1207,11 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) +@@ -1213,7 +1213,11 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) if (!device->d3d_initialized) return WINED3DERR_INVALIDCALL; @@ -877,7 +877,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c if (device->logo_texture) wined3d_texture_decref(device->logo_texture); -@@ -1218,6 +1222,9 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) +@@ -1224,6 +1228,9 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) wine_rb_clear(&device->samplers, device_free_sampler, NULL); @@ -887,7 +887,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c wined3d_device_delete_opengl_contexts(device); if (device->fb.depth_stencil) -@@ -4230,6 +4237,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev +@@ -4236,6 +4243,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev return WINED3DERR_INVALIDCALL; } @@ -895,7 +895,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c if (dst_texture->sub_resources[dst_sub_resource_idx].map_count) { WARN("Destination sub-resource %u is mapped.\n", dst_sub_resource_idx); -@@ -4240,6 +4248,19 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev +@@ -4246,6 +4254,19 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev { WARN("Source sub-resource %u is mapped.\n", src_sub_resource_idx); return WINED3DERR_INVALIDCALL; @@ -915,7 +915,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c } if (!src_box) -@@ -4729,7 +4750,11 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, +@@ -4735,7 +4756,11 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, TRACE("device %p, swapchain_desc %p, mode %p, callback %p, reset_state %#x.\n", device, swapchain_desc, mode, callback, reset_state); @@ -927,7 +927,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c if (!(swapchain = wined3d_device_get_swapchain(device, 0))) { -@@ -5281,3 +5306,58 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL +@@ -5287,3 +5312,58 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL else return CallWindowProcA(proc, window, message, wparam, lparam); } @@ -1360,7 +1360,7 @@ diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h -@@ -2650,6 +2650,16 @@ struct wined3d_state +@@ -2657,6 +2657,16 @@ struct wined3d_state struct wined3d_rasterizer_state *rasterizer_state; }; @@ -1377,7 +1377,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h #define WINED3D_UNMAPPED_STAGE ~0u /* Multithreaded flag. Removed from the public header to signal that -@@ -2761,6 +2771,12 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL +@@ -2768,6 +2778,12 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; @@ -1390,7 +1390,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state) { -@@ -2947,7 +2963,11 @@ struct wined3d_texture +@@ -2954,7 +2970,11 @@ struct wined3d_texture unsigned int map_count; DWORD locations; @@ -1402,7 +1402,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h } sub_resources[1]; }; -@@ -3255,7 +3275,12 @@ struct wined3d_cs_queue +@@ -3262,7 +3282,12 @@ struct wined3d_cs_queue struct wined3d_cs_ops { @@ -1415,7 +1415,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void (*submit)(struct wined3d_cs *cs); void (*finish)(struct wined3d_cs *cs); void (*push_constants)(struct wined3d_cs *cs, enum wined3d_push_constants p, -@@ -3272,7 +3297,13 @@ struct wined3d_cs +@@ -3279,7 +3304,13 @@ struct wined3d_cs HANDLE thread; DWORD thread_id; @@ -1429,7 +1429,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h size_t data_size, start, end; void *data; struct list query_poll_list; -@@ -3355,6 +3386,9 @@ void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined +@@ -3362,6 +3393,9 @@ void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN; diff --git a/staging/VERSION b/staging/VERSION index ae9e8823..f2bd4785 100644 --- a/staging/VERSION +++ b/staging/VERSION @@ -1 +1 @@ -Wine Staging 2.8 +Wine Staging 2.9 (unreleased)