Rebase against ad11f38db92b425e8df84dc4f7ea58366b73e32a.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "dafaae77308be415e024739f227fea64ae85d6d2"
+	echo "ad11f38db92b425e8df84dc4f7ea58366b73e32a"
 }
 
 # Show version information

patches/wined3d-CSMT_Main/0135-wined3d-Remove-software-cursor-support.patch

@@ -1,4 +1,4 @@
-From a97224e11fa08e644eba80e0d8a805405cb82a8c Mon Sep 17 00:00:00 2001
+From 5630b5ff775157526358b39aa01da3d3d3ed2a5e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
 Date: Thu, 3 Oct 2013 19:23:24 +0200
 Subject: wined3d: Remove software cursor support.
@@ -14,7 +14,7 @@ FIXME: Make sure wined3d_device_show_cursor returns the correct value if a softw
  3 files changed, 94 deletions(-)
 
 diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
-index b8408eb..28e6f8c 100644
+index 7b7d5c9..d521cca 100644
 --- a/dlls/wined3d/device.c
 +++ b/dlls/wined3d/device.c
 @@ -1119,8 +1119,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device)
@@ -60,7 +60,7 @@ index b8408eb..28e6f8c 100644
 -    desc.depth = 1;
 -    desc.size = 0;
 -
--    hr = wined3d_texture_create(device, &desc, 1, WINED3D_SURFACE_MAPPABLE,
+-    hr = wined3d_texture_create(device, &desc, 1, WINED3D_TEXTURE_CREATE_MAPPABLE,
 -            &data, NULL, &wined3d_null_parent_ops, &texture);
 -    wined3d_surface_unmap(cursor_image);
 -    if (FAILED(hr))