Rebase against fabde842ede40fc53cf6f5743d5b477841f7b11c.

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "0cb79db12ac7c48477518dcff269ccc5d6b745e0"
+	echo "fabde842ede40fc53cf6f5743d5b477841f7b11c"
 }
 
 # Show version information
@@ -1697,37 +1697,6 @@ if test "$enable_wined3d_Indexed_Vertex_Blending" -eq 1; then
 	enable_wined3d_SWVP_shaders=1
 fi
 
-if test "$enable_wined3d_CSMT_Main" -eq 1; then
-	if test "$enable_d3d11_Deferred_Context" -gt 1; then
-		abort "Patchset d3d11-Deferred_Context disabled, but wined3d-CSMT_Main depends on that."
-	fi
-	if test "$enable_d3d9_Tests" -gt 1; then
-		abort "Patchset d3d9-Tests disabled, but wined3d-CSMT_Main depends on that."
-	fi
-	if test "$enable_wined3d_Accounting" -gt 1; then
-		abort "Patchset wined3d-Accounting disabled, but wined3d-CSMT_Main depends on that."
-	fi
-	if test "$enable_wined3d_DXTn" -gt 1; then
-		abort "Patchset wined3d-DXTn disabled, but wined3d-CSMT_Main depends on that."
-	fi
-	if test "$enable_wined3d_Dual_Source_Blending" -gt 1; then
-		abort "Patchset wined3d-Dual_Source_Blending disabled, but wined3d-CSMT_Main depends on that."
-	fi
-	if test "$enable_wined3d_Silence_FIXMEs" -gt 1; then
-		abort "Patchset wined3d-Silence_FIXMEs disabled, but wined3d-CSMT_Main depends on that."
-	fi
-	if test "$enable_wined3d_UAV_Counters" -gt 1; then
-		abort "Patchset wined3d-UAV_Counters disabled, but wined3d-CSMT_Main depends on that."
-	fi
-	enable_d3d11_Deferred_Context=1
-	enable_d3d9_Tests=1
-	enable_wined3d_Accounting=1
-	enable_wined3d_DXTn=1
-	enable_wined3d_Dual_Source_Blending=1
-	enable_wined3d_Silence_FIXMEs=1
-	enable_wined3d_UAV_Counters=1
-fi
-
 if test "$enable_wineboot_ProxySettings" -eq 1; then
 	if test "$enable_wineboot_DriveSerial" -gt 1; then
 		abort "Patchset wineboot-DriveSerial disabled, but wineboot-ProxySettings depends on that."
@@ -6782,6 +6751,20 @@ if test "$enable_wined3d_Accounting" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset wined3d-CSMT_Main
+# |
+# | Modified files:
+# |   *	dlls/wined3d/cs.c, dlls/wined3d/device.c, dlls/wined3d/wined3d_private.h
+# |
+if test "$enable_wined3d_CSMT_Main" -eq 1; then
+	patch_apply wined3d-CSMT_Main/0042-wined3d-Reset-context-before-destruction.patch
+	patch_apply wined3d-CSMT_Main/0045-wined3d-Improve-wined3d_cs_emit_update_sub_resource.patch
+	(
+		printf '%s\n' '+    { "Sebastian Lackner", "wined3d: Reset context before destruction.", 1 },';
+		printf '%s\n' '+    { "Michael Müller", "wined3d: Improve wined3d_cs_emit_update_sub_resource.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset wined3d-Dual_Source_Blending
 # |
 # | Modified files:
@@ -6797,50 +6780,6 @@ if test "$enable_wined3d_Dual_Source_Blending" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset wined3d-Silence_FIXMEs
-# |
-# | Modified files:
-# |   *	dlls/wined3d/surface.c, dlls/wined3d/texture.c
-# |
-if test "$enable_wined3d_Silence_FIXMEs" -eq 1; then
-	patch_apply wined3d-Silence_FIXMEs/0004-wined3d-Print-FIXME-only-once-in-surface_cpu_blt.patch
-	patch_apply wined3d-Silence_FIXMEs/0006-wined3d-Silence-extremely-noisy-FIXME-in-wined3d_tex.patch
-	(
-		printf '%s\n' '+    { "Christian Costa", "wined3d: Print FIXME only once in surface_cpu_blt.", 1 },';
-		printf '%s\n' '+    { "Sebastian Lackner", "wined3d: Silence extremely noisy FIXME in wined3d_texture_add_dirty_region.", 1 },';
-	) >> "$patchlist"
-fi
-
-# Patchset wined3d-UAV_Counters
-# |
-# | Modified files:
-# |   *	dlls/d3d11/device.c, dlls/wined3d/cs.c, dlls/wined3d/device.c
-# |
-if test "$enable_wined3d_UAV_Counters" -eq 1; then
-	patch_apply wined3d-UAV_Counters/0001-wined3d-Remaining-UAV-counter-changes.patch
-	(
-		printf '%s\n' '+    { "Sebastian Lackner", "wined3d: Remaining UAV counter changes.", 1 },';
-	) >> "$patchlist"
-fi
-
-# Patchset wined3d-CSMT_Main
-# |
-# | This patchset has the following (direct or indirect) dependencies:
-# |   *	nvcuda-CUDA_Support, nvapi-Stub_DLL, d3d11-Deferred_Context, d3d9-Tests, wined3d-Accounting, wined3d-
-# | 	WINED3DFMT_B8G8R8X8_UNORM, wined3d-DXTn, wined3d-Dual_Source_Blending, wined3d-Silence_FIXMEs, wined3d-UAV_Counters
-# |
-# | Modified files:
-# |   *	dlls/wined3d/cs.c, dlls/wined3d/device.c, dlls/wined3d/wined3d_private.h
-# |
-if test "$enable_wined3d_CSMT_Main" -eq 1; then
-	patch_apply wined3d-CSMT_Main/0042-wined3d-Reset-context-before-destruction.patch
-	patch_apply wined3d-CSMT_Main/0045-wined3d-Improve-wined3d_cs_emit_update_sub_resource.patch
-	(
-		printf '%s\n' '+    { "Sebastian Lackner", "wined3d: Reset context before destruction.", 1 },';
-		printf '%s\n' '+    { "Michael Müller", "wined3d: Improve wined3d_cs_emit_update_sub_resource.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset wined3d-SWVP-shaders
 # |
 # | This patchset fixes the following Wine bugs:
@@ -6910,6 +6849,32 @@ if test "$enable_wined3d_Restore_DirectX10_Support" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset wined3d-Silence_FIXMEs
+# |
+# | Modified files:
+# |   *	dlls/wined3d/surface.c, dlls/wined3d/texture.c
+# |
+if test "$enable_wined3d_Silence_FIXMEs" -eq 1; then
+	patch_apply wined3d-Silence_FIXMEs/0004-wined3d-Print-FIXME-only-once-in-surface_cpu_blt.patch
+	patch_apply wined3d-Silence_FIXMEs/0006-wined3d-Silence-extremely-noisy-FIXME-in-wined3d_tex.patch
+	(
+		printf '%s\n' '+    { "Christian Costa", "wined3d: Print FIXME only once in surface_cpu_blt.", 1 },';
+		printf '%s\n' '+    { "Sebastian Lackner", "wined3d: Silence extremely noisy FIXME in wined3d_texture_add_dirty_region.", 1 },';
+	) >> "$patchlist"
+fi
+
+# Patchset wined3d-UAV_Counters
+# |
+# | Modified files:
+# |   *	dlls/d3d11/device.c, dlls/wined3d/cs.c, dlls/wined3d/device.c
+# |
+if test "$enable_wined3d_UAV_Counters" -eq 1; then
+	patch_apply wined3d-UAV_Counters/0001-wined3d-Remaining-UAV-counter-changes.patch
+	(
+		printf '%s\n' '+    { "Sebastian Lackner", "wined3d: Remaining UAV counter changes.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset wined3d-WINED3D_RS_COLORWRITEENABLE
 # |
 # | Modified files:

patches/wined3d-CSMT_Main/0042-wined3d-Reset-context-before-destruction.patch

@@ -1,24 +1,27 @@
-From 25629ab322f251afa9ae5495212c84a00f5af00f Mon Sep 17 00:00:00 2001
+From 657f0e0b86c4b3f2fad5e5bd893ba104fb6bdf7f Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sun, 19 Feb 2017 08:29:23 +0100
 Subject: wined3d: Reset context before destruction.
 
 ---
- dlls/wined3d/device.c | 1 +
- 1 file changed, 1 insertion(+)
+ dlls/wined3d/device.c | 3 +++
+ 1 file changed, 3 insertions(+)
 
 diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
-index aa24d7f4c37..1bf7db30b3d 100644
+index 361ac6b1e..44c51833c 100644
 --- a/dlls/wined3d/device.c
 +++ b/dlls/wined3d/device.c
-@@ -1200,6 +1200,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device)
+@@ -1211,7 +1211,10 @@ void wined3d_device_uninit_3d(struct wined3d_device *device)
+     if (no3d)
+         device->blitter->ops->blitter_destroy(device->blitter, NULL);
+     else
++    {
++        context_set_current(NULL);
+         wined3d_device_delete_opengl_contexts(device);
++    }
  
-     wine_rb_clear(&device->samplers, device_free_sampler, NULL);
- 
-+    context_set_current(NULL);
-     wined3d_device_delete_opengl_contexts(device);
- 
-     if (device->fb.depth_stencil)
+     if ((view = device->fb.depth_stencil))
+     {
 -- 
-2.11.0
+2.21.0
 

patches/wined3d-CSMT_Main/definition

@@ -1,7 +0,0 @@
-Depends: wined3d-Accounting
-Depends: wined3d-DXTn
-Depends: wined3d-Silence_FIXMEs
-Depends: wined3d-UAV_Counters
-Depends: wined3d-Dual_Source_Blending
-Depends: d3d9-Tests
-Depends: d3d11-Deferred_Context