Pablo Martin : d3d11: Make CopySubresourceRegion1 call wined3d_device_copy_sub_resource_region directly.
Module: wine Branch: master Commit: 2bebfa2fc582e8d80bf3f6f935ce3ae9546b6786 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bebfa2fc582e8d80bf3f6f93... Author: Pablo Martin <pmart-wine(a)riseup.net> Date: Fri May 18 16:08:46 2018 +0200 d3d11: Make CopySubresourceRegion1 call wined3d_device_copy_sub_resource_region directly. Signed-off-by: Pablo Martin <pmart-wine(a)riseup.net> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8ec53cc..68d6cf0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2606,16 +2606,25 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion1(ID3 ID3D11Resource *dst_resource, UINT dst_subresource_idx, UINT dst_x, UINT dst_y, UINT dst_z, ID3D11Resource *src_resource, UINT src_subresource_idx, const D3D11_BOX *src_box, UINT flags) { + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct wined3d_resource *wined3d_dst_resource, *wined3d_src_resource; + struct wined3d_box wined3d_src_box; + TRACE("iface %p, dst_resource %p, dst_subresource_idx %u, dst_x %u, dst_y %u, dst_z %u, " "src_resource %p, src_subresource_idx %u, src_box %p, flags %#x.\n", iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, src_resource, src_subresource_idx, src_box, flags); - if (flags) - FIXME("Ignoring flags %#x.\n", flags); + if (src_box) + wined3d_box_set(&wined3d_src_box, src_box->left, src_box->top, + src_box->right, src_box->bottom, src_box->front, src_box->back); - d3d11_immediate_context_CopySubresourceRegion(iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, - src_resource, src_subresource_idx, src_box); + wined3d_dst_resource = wined3d_resource_from_d3d11_resource(dst_resource); + wined3d_src_resource = wined3d_resource_from_d3d11_resource(src_resource); + wined3d_mutex_lock(); + wined3d_device_copy_sub_resource_region(device->wined3d_device, wined3d_dst_resource, dst_subresource_idx, + dst_x, dst_y, dst_z, wined3d_src_resource, src_subresource_idx, src_box ? &wined3d_src_box : NULL, flags); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource1(ID3D11DeviceContext1 *iface,
participants (1)
-
Alexandre Julliard