wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Added patch to implement semi-stub for d3d11 context ResolveSubresource method.

Browse Source
This commit is contained in:
Sebastian Lackner 2017-01-21 23:56:59 +01:00
parent 2677244e40
commit 5e623ee4d9
3 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
patches/d3d11-ResolveSubresource/0001-d3d11-Implement-ResolveSubresource-by-copying-sub-re.patch Normal file
View File

@ -0,0 +1,41 @@
From d16a0f5f4bde197dbdda7b61d8c6b69bbc9be128 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 21 Jan 2017 22:43:12 +0100
Subject: d3d11: Implement ResolveSubresource by copying sub resource (there is
no multisample texture support yet).
---
dlls/d3d11/device.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index 777146d717e..9ad2b2ecaa5 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -1120,10 +1120,22 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11D
ID3D11Resource *src_resource, UINT src_subresource_idx,
DXGI_FORMAT format)
{
- FIXME("iface %p, dst_resource %p, dst_subresource_idx %u, src_resource %p, src_subresource_idx %u, "
+ struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface);
+ struct wined3d_resource *wined3d_dst_resource, *wined3d_src_resource;
+
+ TRACE("iface %p, dst_resource %p, dst_subresource_idx %u, src_resource %p, src_subresource_idx %u, "
"format %s stub!\n",
iface, dst_resource, dst_subresource_idx, src_resource, src_subresource_idx,
debug_dxgi_format(format));
+
+ wined3d_dst_resource = wined3d_resource_from_d3d11_resource(dst_resource);
+ wined3d_src_resource = wined3d_resource_from_d3d11_resource(src_resource);
+
+ /* Multisampled textures are not supported yet, so simply copy the sub resource */
+ wined3d_mutex_lock();
+ wined3d_device_copy_sub_resource_region(device->wined3d_device, wined3d_dst_resource, dst_subresource_idx,
+ 0, 0, 0, wined3d_src_resource, src_subresource_idx, NULL);
+ wined3d_mutex_unlock();
}
static void STDMETHODCALLTYPE d3d11_immediate_context_ExecuteCommandList(ID3D11DeviceContext *iface,
--
2.11.0

1
patches/d3d11-ResolveSubresource/definition Normal file
View File

@ -0,0 +1 @@
Fixes: Implement semi-stub for d3d11 context ResolveSubresource method.

16
patches/patchinstall.sh
View File

@ -112,6 +112,7 @@ patch_enable_all ()
enable_d3d10_1_Forwards="$1"
enable_d3d11_Deferred_Context="$1"
enable_d3d11_ID3D11Texture1D="$1"
enable_d3d11_ResolveSubresource="$1"
enable_d3d8_ValidateShader="$1"
enable_d3d9_DesktopWindow="$1"
enable_d3d9_DrawIndexedPrimitiveUP="$1"
@ -557,6 +558,9 @@ patch_enable ()
d3d11-ID3D11Texture1D)
enable_d3d11_ID3D11Texture1D="$2"
;;
d3d11-ResolveSubresource)
enable_d3d11_ResolveSubresource="$2"
;;
d3d8-ValidateShader)
enable_d3d8_ValidateShader="$2"
;;
@ -3406,6 +3410,18 @@ if test "$enable_d3d11_ID3D11Texture1D" -eq 1; then
) >> "$patchlist"
fi
# Patchset d3d11-ResolveSubresource
# |
# | Modified files:
# | * dlls/d3d11/device.c
# |
if test "$enable_d3d11_ResolveSubresource" -eq 1; then
patch_apply d3d11-ResolveSubresource/0001-d3d11-Implement-ResolveSubresource-by-copying-sub-re.patch
(
printf '%s\n' '+ { "Michael Müller", "d3d11: Implement ResolveSubresource by copying sub resource (there is no multisample texture support yet).", 1 },';
) >> "$patchlist"
fi
# Patchset d3d8-ValidateShader
# |
# | This patchset fixes the following Wine bugs: