October 2021 - Wine-commits

Jan Sikorski : d3d11: Use wined3d_device_context_set_render_targets_and_unordered_access_views() in OMSetRenderTargets.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 4a83ccfb5c066b540f6770aee997abaa62d01679 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a83ccfb5c066b540f6770ae… Author: Jan Sikorski <jsikorski(a)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(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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,

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for reference incrementing functions.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 02195f3ccf41e561694026a3bb73a07c650c83c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02195f3ccf41e561694026a3… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:00 2021 +0200 d3d11: Don't grab wined3d lock for reference incrementing functions. Except wined3d_texture_incref(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 2 -- dlls/d3d11/buffer.c | 2 -- dlls/d3d11/inputlayout.c | 2 -- dlls/d3d11/shader.c | 12 ------------ dlls/d3d11/state.c | 8 -------- dlls/d3d11/view.c | 8 -------- 6 files changed, 34 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index fd83871220d..4476d56404f 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -72,9 +72,7 @@ static ULONG STDMETHODCALLTYPE d3d11_query_AddRef(ID3D11Query *iface) if (refcount == 1) { ID3D11Device2_AddRef(query->device); - wined3d_mutex_lock(); wined3d_query_incref(query->wined3d_query); - wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 09d495c3f61..180641caef5 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -69,9 +69,7 @@ static ULONG STDMETHODCALLTYPE d3d11_buffer_AddRef(ID3D11Buffer *iface) if (refcount == 1) { ID3D11Device2_AddRef(buffer->device); - wined3d_mutex_lock(); wined3d_buffer_incref(buffer->wined3d_buffer); - wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 6b59dd994b3..34d273b31c8 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -138,9 +138,7 @@ static ULONG STDMETHODCALLTYPE d3d11_input_layout_AddRef(ID3D11InputLayout *ifac if (refcount == 1) { ID3D11Device2_AddRef(layout->device); - wined3d_mutex_lock(); wined3d_vertex_declaration_incref(layout->wined3d_decl); - wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 0d19b74ff0b..e474ae692d5 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -69,9 +69,7 @@ static ULONG STDMETHODCALLTYPE d3d11_vertex_shader_AddRef(ID3D11VertexShader *if if (refcount == 1) { ID3D11Device2_AddRef(shader->device); - wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); - wined3d_mutex_unlock(); } return refcount; @@ -365,9 +363,7 @@ static ULONG STDMETHODCALLTYPE d3d11_hull_shader_AddRef(ID3D11HullShader *iface) if (refcount == 1) { ID3D11Device2_AddRef(shader->device); - wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); - wined3d_mutex_unlock(); } return refcount; @@ -558,9 +554,7 @@ static ULONG STDMETHODCALLTYPE d3d11_domain_shader_AddRef(ID3D11DomainShader *if if (refcount == 1) { ID3D11Device2_AddRef(shader->device); - wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); - wined3d_mutex_unlock(); } return refcount; @@ -761,9 +755,7 @@ static ULONG STDMETHODCALLTYPE d3d11_geometry_shader_AddRef(ID3D11GeometryShader if (refcount == 1) { ID3D11Device2_AddRef(shader->device); - wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); - wined3d_mutex_unlock(); } return refcount; @@ -1265,9 +1257,7 @@ static ULONG STDMETHODCALLTYPE d3d11_pixel_shader_AddRef(ID3D11PixelShader *ifac if (refcount == 1) { ID3D11Device2_AddRef(shader->device); - wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); - wined3d_mutex_unlock(); } return refcount; @@ -1560,9 +1550,7 @@ static ULONG STDMETHODCALLTYPE d3d11_compute_shader_AddRef(ID3D11ComputeShader * if (refcount == 1) { ID3D11Device2_AddRef(shader->device); - wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); - wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index d31ea16bbe8..8fa94a12a66 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -64,9 +64,7 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_AddRef(ID3D11BlendState *iface) if (refcount == 1) { ID3D11Device2_AddRef(state->device); - wined3d_mutex_lock(); wined3d_blend_state_incref(state->wined3d_state); - wined3d_mutex_unlock(); } return refcount; @@ -496,9 +494,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_AddRef(ID3D11DepthStenci if (refcount == 1) { ID3D11Device2_AddRef(state->device); - wined3d_mutex_lock(); wined3d_depth_stencil_state_incref(state->wined3d_state); - wined3d_mutex_unlock(); } return refcount; @@ -896,9 +892,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_AddRef(ID3D11RasterizerSta if (refcount == 1) { ID3D11Device2_AddRef(state->device); - wined3d_mutex_lock(); wined3d_rasterizer_state_incref(state->wined3d_state); - wined3d_mutex_unlock(); } return refcount; @@ -1284,9 +1278,7 @@ static ULONG STDMETHODCALLTYPE d3d11_sampler_state_AddRef(ID3D11SamplerState *if if (refcount == 1) { ID3D11Device2_AddRef(state->device); - wined3d_mutex_lock(); wined3d_sampler_incref(state->wined3d_sampler); - wined3d_mutex_unlock(); } return refcount; diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 734c9619e5b..1679729e15c 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -963,9 +963,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_AddRef(ID3D11DepthStencil if (refcount == 1) { ID3D11Device2_AddRef(view->device); - wined3d_mutex_lock(); wined3d_rendertarget_view_incref(view->wined3d_view); - wined3d_mutex_unlock(); } return refcount; @@ -1407,9 +1405,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_AddRef(ID3D11RenderTarget if (refcount == 1) { ID3D11Device2_AddRef(view->device); - wined3d_mutex_lock(); wined3d_rendertarget_view_incref(view->wined3d_view); - wined3d_mutex_unlock(); } return refcount; @@ -1855,9 +1851,7 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_AddRef(ID3D11ShaderRes if (refcount == 1) { ID3D11Device2_AddRef(view->device); - wined3d_mutex_lock(); wined3d_shader_resource_view_incref(view->wined3d_view); - wined3d_mutex_unlock(); } return refcount; @@ -2340,9 +2334,7 @@ static ULONG STDMETHODCALLTYPE d3d11_unordered_access_view_AddRef(ID3D11Unordere if (refcount == 1) { ID3D11Device2_AddRef(view->device); - wined3d_mutex_lock(); wined3d_unordered_access_view_incref(view->wined3d_view); - wined3d_mutex_unlock(); } return refcount;

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for wined3d_texture_incref().
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 8316618912db9fa43ac51de4baa4c17742414793 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8316618912db9fa43ac51de4… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:01 2021 +0200 d3d11: Don't grab wined3d lock for wined3d_texture_incref(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/texture.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 061bbb09795..2a43b24b226 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -76,9 +76,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture1d_AddRef(ID3D11Texture1D *iface) if (refcount == 1) { ID3D11Device2_AddRef(texture->device); - wined3d_mutex_lock(); wined3d_texture_incref(texture->wined3d_texture); - wined3d_mutex_unlock(); } return refcount; @@ -564,9 +562,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_AddRef(ID3D11Texture2D *iface) if (refcount == 1) { ID3D11Device2_AddRef(texture->device); - wined3d_mutex_lock(); wined3d_texture_incref(texture->wined3d_texture); - wined3d_mutex_unlock(); } return refcount; @@ -1119,9 +1115,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_AddRef(ID3D11Texture3D *iface) if (refcount == 1) { ID3D11Device2_AddRef(texture->device); - wined3d_mutex_lock(); wined3d_texture_incref(texture->wined3d_texture); - wined3d_mutex_unlock(); } return refcount;

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for reference decrementing functions.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: a519188f63749ffc04fca27f428ca7679bbe8ee8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a519188f63749ffc04fca27f… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:02 2021 +0200 d3d11: Don't grab wined3d lock for reference decrementing functions. Except wined3d_texture_decref(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 4 ---- dlls/d3d11/buffer.c | 2 -- dlls/d3d11/device.c | 4 ---- dlls/d3d11/inputlayout.c | 4 ---- dlls/d3d11/shader.c | 21 --------------------- dlls/d3d11/state.c | 14 -------------- dlls/d3d11/view.c | 16 ---------------- 7 files changed, 65 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 4476d56404f..74ba62b3d04 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -88,11 +88,7 @@ static ULONG STDMETHODCALLTYPE d3d11_query_Release(ID3D11Query *iface) if (!refcount) { ID3D11Device2 *device = query->device; - - wined3d_mutex_lock(); wined3d_query_decref(query->wined3d_query); - wined3d_mutex_unlock(); - ID3D11Device2_Release(device); } diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 180641caef5..ab8471d6f52 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -86,9 +86,7 @@ static ULONG STDMETHODCALLTYPE d3d11_buffer_Release(ID3D11Buffer *iface) { ID3D11Device2 *device = buffer->device; - wined3d_mutex_lock(); wined3d_buffer_decref(buffer->wined3d_buffer); - wined3d_mutex_unlock(); /* Release the device last, it may cause the wined3d device to be * destroyed. */ ID3D11Device2_Release(device); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 764fbece076..f306f9ebc7a 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -375,9 +375,7 @@ static ULONG STDMETHODCALLTYPE d3d11_command_list_Release(ID3D11CommandList *ifa if (!refcount) { - wined3d_mutex_lock(); wined3d_command_list_decref(list->wined3d_list); - wined3d_mutex_unlock(); wined3d_private_store_cleanup(&list->private_store); ID3D11Device2_Release(list->device); heap_free(list); @@ -4541,9 +4539,7 @@ static ULONG STDMETHODCALLTYPE d3d_device_inner_Release(IUnknown *iface) d3d11_device_context_cleanup(&device->immediate_context); if (device->wined3d_device) { - wined3d_mutex_lock(); wined3d_device_decref(device->wined3d_device); - wined3d_mutex_unlock(); } wine_rb_destroy(&device->sampler_states, NULL, NULL); wine_rb_destroy(&device->rasterizer_states, NULL, NULL); diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 34d273b31c8..520fa0ba7b3 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -154,11 +154,7 @@ static ULONG STDMETHODCALLTYPE d3d11_input_layout_Release(ID3D11InputLayout *ifa if (!refcount) { ID3D11Device2 *device = layout->device; - - wined3d_mutex_lock(); wined3d_vertex_declaration_decref(layout->wined3d_decl); - wined3d_mutex_unlock(); - ID3D11Device2_Release(device); } diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index e474ae692d5..eec164a876c 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -86,9 +86,7 @@ static ULONG STDMETHODCALLTYPE d3d11_vertex_shader_Release(ID3D11VertexShader *i { ID3D11Device2 *device = shader->device; - wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); - wined3d_mutex_unlock(); /* Release the device last, it may cause the wined3d device to be * destroyed. */ ID3D11Device2_Release(device); @@ -379,11 +377,7 @@ static ULONG STDMETHODCALLTYPE d3d11_hull_shader_Release(ID3D11HullShader *iface if (!refcount) { ID3D11Device2 *device = shader->device; - - wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); - wined3d_mutex_unlock(); - /* Release the device last, it may cause the wined3d device to be * destroyed. */ ID3D11Device2_Release(device); @@ -570,11 +564,7 @@ static ULONG STDMETHODCALLTYPE d3d11_domain_shader_Release(ID3D11DomainShader *i if (!refcount) { ID3D11Device2 *device = shader->device; - - wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); - wined3d_mutex_unlock(); - /* Release the device last, it may cause the wined3d device to be * destroyed. */ ID3D11Device2_Release(device); @@ -771,11 +761,7 @@ static ULONG STDMETHODCALLTYPE d3d11_geometry_shader_Release(ID3D11GeometryShade if (!refcount) { ID3D11Device2 *device = shader->device; - - wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); - wined3d_mutex_unlock(); - /* Release the device last, it may cause the wined3d device to be * destroyed. */ ID3D11Device2_Release(device); @@ -1273,10 +1259,7 @@ static ULONG STDMETHODCALLTYPE d3d11_pixel_shader_Release(ID3D11PixelShader *ifa if (!refcount) { ID3D11Device2 *device = shader->device; - - wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); - wined3d_mutex_unlock(); /* Release the device last, it may cause the wined3d device to be * destroyed. */ ID3D11Device2_Release(device); @@ -1566,11 +1549,7 @@ static ULONG STDMETHODCALLTYPE d3d11_compute_shader_Release(ID3D11ComputeShader if (!refcount) { ID3D11Device2 *device = shader->device; - - wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); - wined3d_mutex_unlock(); - /* Release the device last, it may cause the wined3d device to be * destroyed. */ ID3D11Device2_Release(device); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 8fa94a12a66..810217c93b4 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -80,11 +80,7 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface if (!refcount) { ID3D11Device2 *device = state->device; - - wined3d_mutex_lock(); wined3d_blend_state_decref(state->wined3d_state); - wined3d_mutex_unlock(); - ID3D11Device2_Release(device); } @@ -511,9 +507,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_Release(ID3D11DepthStenc { ID3D11Device2 *device = state->device; - wined3d_mutex_lock(); wined3d_depth_stencil_state_decref(state->wined3d_state); - wined3d_mutex_unlock(); ID3D11Device2_Release(device); } @@ -908,11 +902,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_Release(ID3D11RasterizerSt if (!refcount) { ID3D11Device2 *device = state->device; - - wined3d_mutex_lock(); wined3d_rasterizer_state_decref(state->wined3d_state); - wined3d_mutex_unlock(); - ID3D11Device2_Release(device); } @@ -1294,11 +1284,7 @@ static ULONG STDMETHODCALLTYPE d3d11_sampler_state_Release(ID3D11SamplerState *i if (!refcount) { ID3D11Device2 *device = state->device; - - wined3d_mutex_lock(); wined3d_sampler_decref(state->wined3d_sampler); - wined3d_mutex_unlock(); - ID3D11Device2_Release(device); } diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 1679729e15c..89c541fa9ed 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -979,11 +979,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_Release(ID3D11DepthStenci if (!refcount) { ID3D11Device2 *device = view->device; - - wined3d_mutex_lock(); wined3d_rendertarget_view_decref(view->wined3d_view); - wined3d_mutex_unlock(); - ID3D11Device2_Release(device); } @@ -1421,11 +1417,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_Release(ID3D11RenderTarge if (!refcount) { ID3D11Device2 *device = view->device; - - wined3d_mutex_lock(); wined3d_rendertarget_view_decref(view->wined3d_view); - wined3d_mutex_unlock(); - ID3D11Device2_Release(device); } @@ -1867,11 +1859,7 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_Release(ID3D11ShaderRe if (!refcount) { ID3D11Device2 *device = view->device; - - wined3d_mutex_lock(); wined3d_shader_resource_view_decref(view->wined3d_view); - wined3d_mutex_unlock(); - ID3D11Device2_Release(device); } @@ -2350,11 +2338,7 @@ static ULONG STDMETHODCALLTYPE d3d11_unordered_access_view_Release(ID3D11Unorder if (!refcount) { ID3D11Device2 *device = view->device; - - wined3d_mutex_lock(); wined3d_unordered_access_view_decref(view->wined3d_view); - wined3d_mutex_unlock(); - ID3D11Device2_Release(device); }

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for wined3d_texture_decref().
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 589a97ae34ef21b089dc7800928a18e98641d7ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=589a97ae34ef21b089dc7800… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:03 2021 +0200 d3d11: Don't grab wined3d lock for wined3d_texture_decref(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/texture.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 2a43b24b226..4fe395a206c 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -92,10 +92,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture1d_Release(ID3D11Texture1D *iface) if (!refcount) { ID3D11Device2 *device = texture->device; - - wined3d_mutex_lock(); wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); /* Release the device last, it may cause the wined3d device to be * destroyed. */ ID3D11Device2_Release(device); @@ -578,10 +575,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_Release(ID3D11Texture2D *iface) if (!refcount) { ID3D11Device2 *device = texture->device; - - wined3d_mutex_lock(); wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); /* Release the device last, it may cause the wined3d device to be * destroyed. */ ID3D11Device2_Release(device); @@ -1140,9 +1134,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_Release(ID3D11Texture3D *iface) { ID3D11Device2 *device = texture->device; - wined3d_mutex_lock(); wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); /* Release the device last, it may cause the wined3d device to be * destroyed. */ ID3D11Device2_Release(device);

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for query issue functions.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: af43bbdccc7115a860a73a02ec5d720a1ebdc606 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af43bbdccc7115a860a73a02… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:04 2021 +0200 d3d11: Don't grab wined3d lock for query issue functions. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 4 ---- dlls/d3d11/device.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 74ba62b3d04..3054c0fca0a 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -289,10 +289,8 @@ static void STDMETHODCALLTYPE d3d10_query_Begin(ID3D10Query *iface) TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); if (FAILED(hr = wined3d_query_issue(query->wined3d_query, WINED3DISSUE_BEGIN))) ERR("Failed to issue query, hr %#x.\n", hr); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_query_End(ID3D10Query *iface) @@ -302,10 +300,8 @@ static void STDMETHODCALLTYPE d3d10_query_End(ID3D10Query *iface) TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); if (FAILED(hr = wined3d_query_issue(query->wined3d_query, WINED3DISSUE_END))) ERR("Failed to issue query, hr %#x.\n", hr); - wined3d_mutex_unlock(); } static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *data, UINT data_size, UINT flags) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f306f9ebc7a..53afb383bc1 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1015,9 +1015,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_Begin(ID3D11DeviceContext1 *i TRACE("iface %p, asynchronous %p.\n", iface, asynchronous); - wined3d_mutex_lock(); wined3d_device_context_issue_query(context->wined3d_context, query->wined3d_query, WINED3DISSUE_BEGIN); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_End(ID3D11DeviceContext1 *iface, @@ -1028,9 +1026,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_End(ID3D11DeviceContext1 *ifa TRACE("iface %p, asynchronous %p.\n", iface, asynchronous); - wined3d_mutex_lock(); wined3d_device_context_issue_query(context->wined3d_context, query->wined3d_query, WINED3DISSUE_END); - wined3d_mutex_unlock(); } static HRESULT STDMETHODCALLTYPE d3d11_device_context_GetData(ID3D11DeviceContext1 *iface,

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for resource mapping and unmapping.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: e2bbce0faf61dddfd5f7aff8b2c969471e5f990a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2bbce0faf61dddfd5f7aff8… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:05 2021 +0200 d3d11: Don't grab wined3d lock for resource mapping and unmapping. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/buffer.c | 4 ---- dlls/d3d11/device.c | 4 ---- dlls/d3d11/texture.c | 12 ------------ 3 files changed, 20 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index ab8471d6f52..5a6ca81dff4 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -304,11 +304,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP if (map_flags) FIXME("Ignoring map_flags %#x.\n", map_flags); - wined3d_mutex_lock(); hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0, &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)); *data = wined3d_map_desc.data; - wined3d_mutex_unlock(); return hr; } @@ -319,9 +317,7 @@ static void STDMETHODCALLTYPE d3d10_buffer_Unmap(ID3D10Buffer *iface) TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); wined3d_resource_unmap(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_buffer_GetDesc(ID3D10Buffer *iface, D3D10_BUFFER_DESC *desc) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 53afb383bc1..47c3a6aec9b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -815,10 +815,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_context_Map(ID3D11DeviceContext1 * wined3d_resource = wined3d_resource_from_d3d11_resource(resource); - wined3d_mutex_lock(); hr = wined3d_device_context_map(context->wined3d_context, wined3d_resource, subresource_idx, &map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)); - wined3d_mutex_unlock(); mapped_subresource->pData = map_desc.data; mapped_subresource->RowPitch = map_desc.row_pitch; @@ -837,9 +835,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_Unmap(ID3D11DeviceContext1 *i wined3d_resource = wined3d_resource_from_d3d11_resource(resource); - wined3d_mutex_lock(); wined3d_device_context_unmap(context->wined3d_context, wined3d_resource, subresource_idx); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_PSSetConstantBuffers(ID3D11DeviceContext1 *iface, diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 4fe395a206c..87928e638d1 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -349,13 +349,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture1d_Map(ID3D10Texture1D *iface, UIN if (map_flags) FIXME("Ignoring map_flags %#x.\n", map_flags); - wined3d_mutex_lock(); if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx, &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)))) { *data = wined3d_map_desc.data; } - wined3d_mutex_unlock(); return hr; } @@ -366,9 +364,7 @@ static void STDMETHODCALLTYPE d3d10_texture1d_Unmap(ID3D10Texture1D *iface, UINT TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); - wined3d_mutex_lock(); wined3d_resource_unmap(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_texture1d_GetDesc(ID3D10Texture1D *iface, D3D10_TEXTURE1D_DESC *desc) @@ -846,14 +842,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_Map(ID3D10Texture2D *iface, UIN if (map_flags) FIXME("Ignoring map_flags %#x.\n", map_flags); - wined3d_mutex_lock(); if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx, &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)))) { mapped_texture->pData = wined3d_map_desc.data; mapped_texture->RowPitch = wined3d_map_desc.row_pitch; } - wined3d_mutex_unlock(); return hr; } @@ -864,9 +858,7 @@ static void STDMETHODCALLTYPE d3d10_texture2d_Unmap(ID3D10Texture2D *iface, UINT TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); - wined3d_mutex_lock(); wined3d_resource_unmap(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_texture2d_GetDesc(ID3D10Texture2D *iface, D3D10_TEXTURE2D_DESC *desc) @@ -1339,7 +1331,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UIN if (map_flags) FIXME("Ignoring map_flags %#x.\n", map_flags); - wined3d_mutex_lock(); if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx, &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)))) { @@ -1347,7 +1338,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UIN mapped_texture->RowPitch = wined3d_map_desc.row_pitch; mapped_texture->DepthPitch = wined3d_map_desc.slice_pitch; } - wined3d_mutex_unlock(); return hr; } @@ -1358,9 +1348,7 @@ static void STDMETHODCALLTYPE d3d10_texture3d_Unmap(ID3D10Texture3D *iface, UINT TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); - wined3d_mutex_lock(); wined3d_resource_unmap(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_texture3d_GetDesc(ID3D10Texture3D *iface, D3D10_TEXTURE3D_DESC *desc)

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for wined3d state setters.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 228c3bdfec897bd1b73474686fae8f23dda7aa29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=228c3bdfec897bd1b7347468… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:06 2021 +0200 d3d11: Don't grab wined3d lock for wined3d state setters. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 71 ----------------------------------------------------- 1 file changed, 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=228c3bdfec897bd1b734…

1 0

Paul Gofman : winhttp: Don't send notifications when connection is closed on read finish.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: d349013ddea1c407189cd22df2a4ff8bf025085b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d349013ddea1c407189cd22d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 15 16:59:48 2021 +0300 winhttp: Don't send notifications when connection is closed on read finish. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 10 ++++------ dlls/winhttp/tests/notification.c | 32 ++++++++------------------------ 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2c064bb767b..c908e26956f 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1797,13 +1797,11 @@ static void finished_reading( struct request *request ) if (!wcsicmp( connection, L"close" )) close = TRUE; } else if (!wcscmp( request->version, L"HTTP/1.0" )) close = TRUE; - if (close) - { - close_connection( request ); - return; - } - cache_connection( request->netconn ); + if (close) + netconn_close( request->netconn ); + else + cache_connection( request->netconn ); request->netconn = NULL; } diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index bc1283adcf7..72cef89a618 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -1124,32 +1124,15 @@ static const struct notification read_test[] = { winhttp_read_data, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SIGNAL } }; -static const struct notification read_allow_close_test[] = -{ - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NF_ALLOW }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, NF_ALLOW }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, NF_ALLOW }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, NF_ALLOW }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SIGNAL } -}; - -#define read_request_data(a,b,c,d) _read_request_data(a,b,c,d,__LINE__) -static void _read_request_data(struct test_request *req, struct info *info, const char *expected_data, BOOL closing_connection, unsigned line) +#define read_request_data(a,b,c) _read_request_data(a,b,c,__LINE__) +static void _read_request_data(struct test_request *req, struct info *info, const char *expected_data, unsigned line) { char buffer[1024]; DWORD len; BOOL ret; - if (closing_connection) - { - info->test = read_allow_close_test; - info->count = ARRAY_SIZE( read_allow_close_test ); - } - else - { - info->test = read_test; - info->count = ARRAY_SIZE( read_test ); - } + info->test = read_test; + info->count = ARRAY_SIZE( read_test ); info->index = 0; setup_test( info, winhttp_read_data, line ); @@ -1180,7 +1163,7 @@ static void test_persistent_connection(int port) "Content-Length: 1\r\n" "\r\n" "X" ); - read_request_data( &req, &info, "X", FALSE ); + read_request_data( &req, &info, "X" ); close_request( &req, &info, FALSE ); /* chunked connection test */ @@ -1194,7 +1177,7 @@ static void test_persistent_connection(int port) "\r\n" "9\r\n123456789\r\n" "0\r\n\r\n" ); - read_request_data( &req, &info, "123456789", FALSE ); + read_request_data( &req, &info, "123456789" ); close_request( &req, &info, FALSE ); /* HTTP/1.1 connections are persistent by default, no additional header is needed */ @@ -1206,7 +1189,7 @@ static void test_persistent_connection(int port) "Content-Length: 2\r\n" "\r\n" "xx" ); - read_request_data( &req, &info, "xx", FALSE ); + read_request_data( &req, &info, "xx" ); close_request( &req, &info, FALSE ); open_async_request( port, &req, &info, L"/test", TRUE ); @@ -1218,6 +1201,7 @@ static void test_persistent_connection(int port) "Connection: close\r\n" "\r\n" "yy" ); + read_request_data( &req, &info, "yy" ); close_request( &req, &info, TRUE ); SetEvent( server_socket_done );

1 0

Paul Gofman : winhttp: Process end of read data before sending callback in read_data().
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 3a8ccb924268c5f9eeff204c87ba30dc0fe587e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a8ccb924268c5f9eeff204c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 15 16:59:49 2021 +0300 winhttp: Process end of read data before sending callback in read_data(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index c908e26956f..d76edfa71d7 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1848,6 +1848,7 @@ static DWORD read_data( struct request *request, void *buffer, DWORD size, DWORD done: TRACE( "retrieved %u bytes (%u/%u)\n", bytes_read, request->content_read, request->content_length ); + if (end_of_read_data( request )) finished_reading( request ); if (async) { if (!ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, buffer, bytes_read ); @@ -1861,7 +1862,6 @@ done: } if (!ret && read) *read = bytes_read; - if (end_of_read_data( request )) finished_reading( request ); return ret; }

1 0