Module: wine Branch: master Commit: 4a83ccfb5c066b540f6770aee997abaa62d01679 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a83ccfb5c066b540f6770aee...
Author: Jan Sikorski jsikorski@codeweavers.com Date: Fri Oct 15 14:25:59 2021 +0200
d3d11: Use wined3d_device_context_set_render_targets_and_unordered_access_views() in OMSetRenderTargets.
Signed-off-by: Jan Sikorski jsikorski@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3d11/device.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 31c68f62e68..764fbece076 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1128,11 +1128,8 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMSetRenderTargets(ID3D11Devi
dsv = unsafe_impl_from_ID3D11DepthStencilView(depth_stencil_view);
- wined3d_mutex_lock(); - wined3d_device_context_set_rendertarget_views(context->wined3d_context, 0, - ARRAY_SIZE(wined3d_rtvs), wined3d_rtvs, FALSE); - wined3d_device_context_set_depth_stencil_view(context->wined3d_context, dsv ? dsv->wined3d_view : NULL); - wined3d_mutex_unlock(); + wined3d_device_context_set_render_targets_and_unordered_access_views(context->wined3d_context, + ARRAY_SIZE(wined3d_rtvs), wined3d_rtvs, dsv ? dsv->wined3d_view : NULL, ~0u, NULL, NULL); }
static void STDMETHODCALLTYPE d3d11_device_context_OMSetRenderTargetsAndUnorderedAccessViews( @@ -4988,12 +4985,8 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetRenderTargets(ID3D10Device1 *ifa
dsv = unsafe_impl_from_ID3D10DepthStencilView(depth_stencil_view);
- wined3d_mutex_lock(); - wined3d_device_context_set_rendertarget_views(device->immediate_context.wined3d_context, 0, - ARRAY_SIZE(wined3d_rtvs), wined3d_rtvs, FALSE); - wined3d_device_context_set_depth_stencil_view(device->immediate_context.wined3d_context, - dsv ? dsv->wined3d_view : NULL); - wined3d_mutex_unlock(); + wined3d_device_context_set_render_targets_and_unordered_access_views(device->immediate_context.wined3d_context, + ARRAY_SIZE(wined3d_rtvs), wined3d_rtvs, dsv ? dsv->wined3d_view : NULL, ~0u, NULL, NULL); }
static void STDMETHODCALLTYPE d3d10_device_OMSetBlendState(ID3D10Device1 *iface,