Rebase against dc80a0032927421d61b95659af570c21439e4a76

wine-staging · Jan 2, 2019 · 9256515 · 9256515 · Tk-Glitch · Jan 3, 2019
1 parent ae1f954
commit 9256515
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/patches/d3d11-Deferred_Context/0001-d3d11-Add-stub-deferred-rendering-context.patch b/patches/d3d11-Deferred_Context/0001-d3d11-Add-stub-deferred-rendering-context.patch
@@ -1362,7 +1362,7 @@ index c930248..80f73de 100644
 +    object->device = iface;
 +    object->refcount = 1;
 +
-+    ID3D11Device_AddRef(iface);
++    ID3D11Device2_AddRef(iface);
 +    wined3d_private_store_init(&object->private_store);
 +
 +    *context = &object->ID3D11DeviceContext_iface;

diff --git a/...s/ddraw-Rendering_Targets/0001-ddraw-Create-rendering-targets-in-video-memory-if-po.patch b/...s/ddraw-Rendering_Targets/0001-ddraw-Create-rendering-targets-in-video-memory-if-po.patch
@@ -198,7 +198,7 @@ index 8190442..c73981b 100644
 +                        bind_flags, WINED3D_RTYPE_TEXTURE_2D, wined3d_desc.format)))
 +        {
 +            FIXME("Application wants to create rendering target in system memory, using video memory instead\n");
-+            wined3d_desc.usage = wined3d_desc.bind_flags;
++            wined3d_desc.bind_flags = bind_flags;
 +        }
 +        else
 +            wined3d_desc.access = WINED3D_RESOURCE_ACCESS_CPU

diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "2058505cebc7bb069e1e2d0d738353336e943b7b"
+	echo "dc80a0032927421d61b95659af570c21439e4a76"
 }
 
 # Show version information