Rebase against 9c526b41314359c52954f7f367cb9d7b4a26c3ac.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "44f2589e7c239243b587e2d7ff92f4cdde61c3b6"
+	echo "9c526b41314359c52954f7f367cb9d7b4a26c3ac"
 }
 
 # Show version information

patches/wined3d-CSMT_Main/0155-wined3d-Make-sure-the-new-window-is-set-up-before-se.patch

@@ -1,4 +1,4 @@
-From cc06aee370abd3cb1d9cd3ff52a8859c7810fcd7 Mon Sep 17 00:00:00 2001
+From 003aabc11ecba217dbf01cd479a9b4b9a9ec4464 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
 Date: Fri, 29 Aug 2014 14:46:19 +0200
 Subject: wined3d: Make sure the new window is set up before setting up a
@@ -9,10 +9,10 @@ Subject: wined3d: Make sure the new window is set up before setting up a
  1 file changed, 21 insertions(+), 10 deletions(-)
 
 diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
-index 0173d18..3ae0091 100644
+index 1f02518..f5bc02a 100644
 --- a/dlls/wined3d/device.c
 +++ b/dlls/wined3d/device.c
-@@ -4454,6 +4454,27 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
+@@ -4570,6 +4570,27 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
          }
      }
  
@@ -40,7 +40,7 @@ index 0173d18..3ae0091 100644
      TRACE("New params:\n");
      TRACE("backbuffer_width %u\n", swapchain_desc->backbuffer_width);
      TRACE("backbuffer_height %u\n", swapchain_desc->backbuffer_height);
-@@ -4580,11 +4601,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
+@@ -4696,11 +4717,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
              swapchain_desc->multisample_type, swapchain_desc->multisample_quality)))
          return hr;
  
@@ -52,7 +52,7 @@ index 0173d18..3ae0091 100644
      if (swapchain->desc.enable_auto_depth_stencil)
      {
          struct wined3d_resource_desc texture_desc;
-@@ -4627,11 +4643,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
+@@ -4742,11 +4758,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
          wined3d_device_set_depth_stencil_view(device, device->auto_depth_stencil_view);
      }
  
@@ -61,9 +61,9 @@ index 0173d18..3ae0091 100644
 -        wined3d_rendertarget_view_decref(device->back_buffer_view);
 -        device->back_buffer_view = NULL;
 -    }
-     if (swapchain->desc.backbuffer_count && FAILED(hr = wined3d_rendertarget_view_create_from_surface(
-             surface_from_resource(wined3d_texture_get_sub_resource(swapchain->back_buffers[0], 0)),
-             NULL, &wined3d_null_parent_ops, &device->back_buffer_view)))
+     if (swapchain->desc.backbuffer_count)
+     {
+         view_desc.format_id = swapchain_desc->backbuffer_format;
 -- 
-2.5.1
+2.7.0