April 2017 - Wine-commits - list.winehq.org

Józef Kucia : d3d11: Get rid of "rasterizer_state" from struct d3d_device.
by Alexandre Julliard 27 Apr '17

27 Apr '17

Module: wine Branch: master Commit: 6a9e506fd55206a4b02ebb220e778ee31bc13b07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a9e506fd55206a4b02ebb220… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 27 12:02:46 2017 +0200 d3d11: Get rid of "rasterizer_state" from struct d3d_device. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 1 - dlls/d3d11/device.c | 37 ++++++++++++++++++++++++++++++------- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 3a9729b..a8987cb 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -521,7 +521,6 @@ struct d3d_device float blend_factor[4]; struct d3d_depthstencil_state *depth_stencil_state; UINT stencil_ref; - struct d3d_rasterizer_state *rasterizer_state; }; static inline struct d3d_device *impl_from_ID3D11Device(ID3D11Device *iface) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 095908d..c5ead36 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -877,12 +877,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon ID3D11RasterizerState *rasterizer_state) { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_rasterizer_state *rasterizer_state_impl; const D3D11_RASTERIZER_DESC *desc; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); wined3d_mutex_lock(); - if (!(device->rasterizer_state = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state))) + if (!(rasterizer_state_impl = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state))) { wined3d_device_set_rasterizer_state(device->wined3d_device, NULL); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, WINED3D_FILL_SOLID); @@ -894,9 +895,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon return; } - wined3d_device_set_rasterizer_state(device->wined3d_device, device->rasterizer_state->wined3d_state); + wined3d_device_set_rasterizer_state(device->wined3d_device, rasterizer_state_impl->wined3d_state); - desc = &device->rasterizer_state->desc; + desc = &rasterizer_state_impl->desc; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, desc->FillMode); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, desc->CullMode); /* OpenGL style depth bias. */ @@ -1949,11 +1950,22 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetState(ID3D11DeviceCon ID3D11RasterizerState **rasterizer_state) { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_rasterizer_state *rasterizer_state_impl; + struct wined3d_rasterizer_state *wined3d_state; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); - if ((*rasterizer_state = device->rasterizer_state ? &device->rasterizer_state->ID3D11RasterizerState_iface : NULL)) - ID3D11RasterizerState_AddRef(*rasterizer_state); + wined3d_mutex_lock(); + if ((wined3d_state = wined3d_device_get_rasterizer_state(device->wined3d_device))) + { + rasterizer_state_impl = wined3d_rasterizer_state_get_parent(wined3d_state); + ID3D11RasterizerState_AddRef(*rasterizer_state = &rasterizer_state_impl->ID3D11RasterizerState_iface); + } + else + { + *rasterizer_state = NULL; + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetViewports(ID3D11DeviceContext *iface, @@ -4612,11 +4624,22 @@ static void STDMETHODCALLTYPE d3d10_device_SOGetTargets(ID3D10Device1 *iface, static void STDMETHODCALLTYPE d3d10_device_RSGetState(ID3D10Device1 *iface, ID3D10RasterizerState **rasterizer_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); + struct d3d_rasterizer_state *rasterizer_state_impl; + struct wined3d_rasterizer_state *wined3d_state; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); - if ((*rasterizer_state = device->rasterizer_state ? &device->rasterizer_state->ID3D10RasterizerState_iface : NULL)) - ID3D10RasterizerState_AddRef(*rasterizer_state); + wined3d_mutex_lock(); + if ((wined3d_state = wined3d_device_get_rasterizer_state(device->wined3d_device))) + { + rasterizer_state_impl = wined3d_rasterizer_state_get_parent(wined3d_state); + ID3D10RasterizerState_AddRef(*rasterizer_state = &rasterizer_state_impl->ID3D10RasterizerState_iface); + } + else + { + *rasterizer_state = NULL; + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_device_RSGetViewports(ID3D10Device1 *iface,

1 0

Józef Kucia : d3d11: Delay destroying depth stencil view until it is no longer referenced.
by Alexandre Julliard 27 Apr '17

27 Apr '17

Module: wine Branch: master Commit: 02a767cde201a437c9edec20054f46eada05624b URL: http://source.winehq.org/git/wine.git/?a=commit;h=02a767cde201a437c9edec200… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 27 12:02:47 2017 +0200 d3d11: Delay destroying depth stencil view until it is no longer referenced. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/view.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index ac5395d..85c16d8 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -999,6 +999,14 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_AddRef(ID3D11DepthStencil TRACE("%p increasing refcount to %u.\n", view, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(view->device); + wined3d_mutex_lock(); + wined3d_rendertarget_view_incref(view->wined3d_view); + wined3d_mutex_unlock(); + } + return refcount; } @@ -1011,12 +1019,13 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_Release(ID3D11DepthStenci if (!refcount) { + ID3D11Device *device = view->device; + wined3d_mutex_lock(); wined3d_rendertarget_view_decref(view->wined3d_view); - ID3D11Device_Release(view->device); - wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, view); + + ID3D11Device_Release(device); } return refcount; @@ -1225,6 +1234,19 @@ static const struct ID3D10DepthStencilViewVtbl d3d10_depthstencil_view_vtbl = d3d10_depthstencil_view_GetDesc, }; +static void STDMETHODCALLTYPE d3d_depth_stencil_view_wined3d_object_destroyed(void *parent) +{ + struct d3d_depthstencil_view *view = parent; + + wined3d_private_store_cleanup(&view->private_store); + HeapFree(GetProcessHeap(), 0, parent); +} + +static const struct wined3d_parent_ops d3d_depth_stencil_view_wined3d_parent_ops = +{ + d3d_depth_stencil_view_wined3d_object_destroyed, +}; + static void wined3d_depth_stencil_view_desc_from_d3d11(struct wined3d_view_desc *wined3d_desc, const D3D11_DEPTH_STENCIL_VIEW_DESC *desc) { @@ -1318,7 +1340,7 @@ static HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, st wined3d_depth_stencil_view_desc_from_d3d11(&wined3d_desc, &view->desc); if (FAILED(hr = wined3d_rendertarget_view_create(&wined3d_desc, wined3d_resource, - view, &d3d_null_wined3d_parent_ops, &view->wined3d_view))) + view, &d3d_depth_stencil_view_wined3d_parent_ops, &view->wined3d_view))) { wined3d_mutex_unlock(); WARN("Failed to create a wined3d rendertarget view, hr %#x.\n", hr);

1 0

Józef Kucia : d3d11: Delay destroying render target view until it is no longer referenced.
by Alexandre Julliard 27 Apr '17

27 Apr '17

Module: wine Branch: master Commit: 2437e3559c8369721586578bc738e70bf388910e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2437e3559c8369721586578bc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 27 12:02:48 2017 +0200 d3d11: Delay destroying render target view until it is no longer referenced. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/view.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 85c16d8..cdd380b 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1442,6 +1442,14 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_AddRef(ID3D11RenderTarget TRACE("%p increasing refcount to %u.\n", view, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(view->device); + wined3d_mutex_lock(); + wined3d_rendertarget_view_incref(view->wined3d_view); + wined3d_mutex_unlock(); + } + return refcount; } @@ -1454,12 +1462,13 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_Release(ID3D11RenderTarge if (!refcount) { + ID3D11Device *device = view->device; + wined3d_mutex_lock(); wined3d_rendertarget_view_decref(view->wined3d_view); - ID3D11Device_Release(view->device); - wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, view); + + ID3D11Device_Release(device); } return refcount; @@ -1665,6 +1674,19 @@ static const struct ID3D10RenderTargetViewVtbl d3d10_rendertarget_view_vtbl = d3d10_rendertarget_view_GetDesc, }; +static void STDMETHODCALLTYPE d3d_render_target_view_wined3d_object_destroyed(void *parent) +{ + struct d3d_rendertarget_view *view = parent; + + wined3d_private_store_cleanup(&view->private_store); + HeapFree(GetProcessHeap(), 0, parent); +} + +static const struct wined3d_parent_ops d3d_render_target_view_wined3d_parent_ops = +{ + d3d_render_target_view_wined3d_object_destroyed, +}; + static void wined3d_rendertarget_view_desc_from_d3d11(struct wined3d_view_desc *wined3d_desc, const D3D11_RENDER_TARGET_VIEW_DESC *desc) { @@ -1766,7 +1788,7 @@ static HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, st wined3d_rendertarget_view_desc_from_d3d11(&wined3d_desc, &view->desc); if (FAILED(hr = wined3d_rendertarget_view_create(&wined3d_desc, wined3d_resource, - view, &d3d_null_wined3d_parent_ops, &view->wined3d_view))) + view, &d3d_render_target_view_wined3d_parent_ops, &view->wined3d_view))) { wined3d_mutex_unlock(); WARN("Failed to create a wined3d rendertarget view, hr %#x.\n", hr);

1 0

Józef Kucia : d3d11: Delay destroying shader resource view until it is no longer referenced.
by Alexandre Julliard 27 Apr '17

27 Apr '17

Module: wine Branch: master Commit: 668650335d85bc10c107e59caf211128adfabca3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=668650335d85bc10c107e59ca… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 27 12:02:49 2017 +0200 d3d11: Delay destroying shader resource view until it is no longer referenced. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/view.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index cdd380b..f1478ba 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1891,6 +1891,14 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_AddRef(ID3D11ShaderRes TRACE("%p increasing refcount to %u.\n", view, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(view->device); + wined3d_mutex_lock(); + wined3d_shader_resource_view_incref(view->wined3d_view); + wined3d_mutex_unlock(); + } + return refcount; } @@ -1903,12 +1911,13 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_Release(ID3D11ShaderRe if (!refcount) { + ID3D11Device *device = view->device; + wined3d_mutex_lock(); wined3d_shader_resource_view_decref(view->wined3d_view); - ID3D11Device_Release(view->device); - wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, view); + + ID3D11Device_Release(device); } return refcount; @@ -2127,6 +2136,19 @@ static const struct ID3D10ShaderResourceView1Vtbl d3d10_shader_resource_view_vtb d3d10_shader_resource_view_GetDesc1, }; +static void STDMETHODCALLTYPE d3d_shader_resource_view_wined3d_object_destroyed(void *parent) +{ + struct d3d_shader_resource_view *view = parent; + + wined3d_private_store_cleanup(&view->private_store); + HeapFree(GetProcessHeap(), 0, parent); +} + +static const struct wined3d_parent_ops d3d_shader_resource_view_wined3d_parent_ops = +{ + d3d_shader_resource_view_wined3d_object_destroyed, +}; + static unsigned int wined3d_view_flags_from_d3d11_bufferex_flags(unsigned int d3d11_flags) { unsigned int wined3d_flags = d3d11_flags & WINED3D_VIEW_BUFFER_RAW; @@ -2267,7 +2289,7 @@ static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *vi } if (FAILED(hr = wined3d_shader_resource_view_create(&wined3d_desc, wined3d_resource, - view, &d3d_null_wined3d_parent_ops, &view->wined3d_view))) + view, &d3d_shader_resource_view_wined3d_parent_ops, &view->wined3d_view))) { wined3d_mutex_unlock(); WARN("Failed to create wined3d shader resource view, hr %#x.\n", hr);

1 0

Józef Kucia : d3d11: Delay destroying unordered access view until it is no longer referenced.
by Alexandre Julliard 27 Apr '17

27 Apr '17

Module: wine Branch: master Commit: 5b305503112613c952b39e00003da1a1bfd30d3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b305503112613c952b39e000… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 27 12:02:50 2017 +0200 d3d11: Delay destroying unordered access view until it is no longer referenced. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 2 -- dlls/d3d11/device.c | 2 +- dlls/d3d11/view.c | 30 ++++++++++++++++++++++++++---- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index a8987cb..cbc8d7c 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -54,8 +54,6 @@ struct d3d_device; -extern const struct wined3d_parent_ops d3d_null_wined3d_parent_ops DECLSPEC_HIDDEN; - /* TRACE helper functions */ const char *debug_d3d10_primitive_topology(D3D10_PRIMITIVE_TOPOLOGY topology) DECLSPEC_HIDDEN; const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c5ead36..259f189 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); static void STDMETHODCALLTYPE d3d_null_wined3d_object_destroyed(void *parent) {} -const struct wined3d_parent_ops d3d_null_wined3d_parent_ops = +static const struct wined3d_parent_ops d3d_null_wined3d_parent_ops = { d3d_null_wined3d_object_destroyed, }; diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index f1478ba..f747c4b 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -2377,6 +2377,14 @@ static ULONG STDMETHODCALLTYPE d3d11_unordered_access_view_AddRef(ID3D11Unordere TRACE("%p increasing refcount to %u.\n", view, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(view->device); + wined3d_mutex_lock(); + wined3d_unordered_access_view_incref(view->wined3d_view); + wined3d_mutex_unlock(); + } + return refcount; } @@ -2389,12 +2397,13 @@ static ULONG STDMETHODCALLTYPE d3d11_unordered_access_view_Release(ID3D11Unorder if (!refcount) { + ID3D11Device *device = view->device; + wined3d_mutex_lock(); wined3d_unordered_access_view_decref(view->wined3d_view); - ID3D11Device_Release(view->device); - wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, view); + + ID3D11Device_Release(device); } return refcount; @@ -2477,6 +2486,19 @@ static const struct ID3D11UnorderedAccessViewVtbl d3d11_unordered_access_view_vt d3d11_unordered_access_view_GetDesc, }; +static void STDMETHODCALLTYPE d3d11_unordered_access_view_wined3d_object_destroyed(void *parent) +{ + struct d3d11_unordered_access_view *view = parent; + + wined3d_private_store_cleanup(&view->private_store); + HeapFree(GetProcessHeap(), 0, parent); +} + +static const struct wined3d_parent_ops d3d11_unordered_access_view_wined3d_parent_ops = +{ + d3d11_unordered_access_view_wined3d_object_destroyed, +}; + static unsigned int wined3d_view_flags_from_d3d11_buffer_uav_flags(unsigned int d3d11_flags) { unsigned int wined3d_flags = d3d11_flags & (WINED3D_VIEW_BUFFER_RAW @@ -2577,7 +2599,7 @@ static HRESULT d3d11_unordered_access_view_init(struct d3d11_unordered_access_vi } if (FAILED(hr = wined3d_unordered_access_view_create(&wined3d_desc, wined3d_resource, - view, &d3d_null_wined3d_parent_ops, &view->wined3d_view))) + view, &d3d11_unordered_access_view_wined3d_parent_ops, &view->wined3d_view))) { wined3d_mutex_unlock(); WARN("Failed to create wined3d unordered access view, hr %#x.\n", hr);

1 0

Józef Kucia : d3d11: Delay destroying sampler state until it is no longer referenced.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: 5813b93185aeb26ff0fca105d320cb92a9c39af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5813b93185aeb26ff0fca105d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:19:55 2017 +0200 d3d11: Delay destroying sampler state until it is no longer referenced. Implements D3D11 behavior. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index c8e443f..b85bd67 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -947,6 +947,14 @@ static ULONG STDMETHODCALLTYPE d3d11_sampler_state_AddRef(ID3D11SamplerState *if TRACE("%p increasing refcount to %u.\n", state, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(state->device); + wined3d_mutex_lock(); + wined3d_sampler_incref(state->wined3d_sampler); + wined3d_mutex_unlock(); + } + return refcount; } @@ -959,15 +967,13 @@ static ULONG STDMETHODCALLTYPE d3d11_sampler_state_Release(ID3D11SamplerState *i if (!refcount) { - struct d3d_device *device = impl_from_ID3D11Device(state->device); + ID3D11Device *device = state->device; wined3d_mutex_lock(); wined3d_sampler_decref(state->wined3d_sampler); - wine_rb_remove(&device->sampler_states, &state->entry); - ID3D11Device_Release(state->device); - wined3d_private_store_cleanup(&state->private_store); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, state); + + ID3D11Device_Release(device); } return refcount; @@ -1146,6 +1152,21 @@ static const struct ID3D10SamplerStateVtbl d3d10_sampler_state_vtbl = d3d10_sampler_state_GetDesc, }; +static void STDMETHODCALLTYPE d3d_sampler_wined3d_object_destroyed(void *parent) +{ + struct d3d_sampler_state *state = parent; + struct d3d_device *device = impl_from_ID3D11Device(state->device); + + wine_rb_remove(&device->sampler_states, &state->entry); + wined3d_private_store_cleanup(&state->private_store); + HeapFree(GetProcessHeap(), 0, parent); +} + +static const struct wined3d_parent_ops d3d_sampler_wined3d_parent_ops = +{ + d3d_sampler_wined3d_object_destroyed, +}; + static enum wined3d_texture_address wined3d_texture_address_from_d3d11(enum D3D11_TEXTURE_ADDRESS_MODE t) { return (enum wined3d_texture_address)t; @@ -1212,7 +1233,7 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic wined3d_desc.srgb_decode = TRUE; if (FAILED(hr = wined3d_sampler_create(device->wined3d_device, &wined3d_desc, - state, &d3d_null_wined3d_parent_ops, &state->wined3d_sampler))) + state, &d3d_sampler_wined3d_parent_ops, &state->wined3d_sampler))) { WARN("Failed to create wined3d sampler, hr %#x.\n", hr); wined3d_private_store_cleanup(&state->private_store);

1 0

Józef Kucia : d3d11/tests: Add test for state refcounting.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: df5576f3cd7a611b7088dfcf0fd7a3f53d8fbda4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5576f3cd7a611b7088dfcf0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:42:07 2017 +0200 d3d11/tests: Add test for state refcounting. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5d3b818..97e7775 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18,6 +18,7 @@ */ #include <assert.h> +#include <float.h> #include <stdlib.h> #define COBJMACROS #include "initguid.h" @@ -5291,6 +5292,70 @@ static void test_private_data(void) ok(!refcount, "Test object has %u references left.\n", refcount); } +static void test_state_refcounting(const D3D_FEATURE_LEVEL feature_level) +{ + ID3D11SamplerState *sampler, *tmp_sampler; + D3D11_SAMPLER_DESC sampler_desc; + struct device_desc device_desc; + ID3D11DeviceContext *context; + ID3D11Device *device; + ULONG refcount; + HRESULT hr; + + device_desc.feature_level = &feature_level; + device_desc.flags = 0; + if (!(device = create_device(&device_desc))) + { + skip("Failed to create device for feature level %#x.\n", feature_level); + return; + } + + ID3D11Device_GetImmediateContext(device, &context); + + sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR; + sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_WRAP; + sampler_desc.AddressV = D3D11_TEXTURE_ADDRESS_WRAP; + sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_WRAP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D11_COMPARISON_ALWAYS; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 1.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 1.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = FLT_MAX; + hr = ID3D11Device_CreateSamplerState(device, &sampler_desc, &sampler); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + + hr = ID3D11Device_CreateSamplerState(device, &sampler_desc, &tmp_sampler); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + + tmp_sampler = sampler; + refcount = get_refcount(sampler); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ID3D11DeviceContext_PSSetSamplers(context, 0, 1, &sampler); + refcount = ID3D11SamplerState_Release(sampler); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + sampler = NULL; + ID3D11DeviceContext_PSGetSamplers(context, 0, 1, &sampler); + ok(sampler == tmp_sampler, "Got sampler %p, expected %p.\n", sampler, tmp_sampler); + refcount = ID3D11SamplerState_Release(sampler); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + + hr = ID3D11Device_CreateSamplerState(device, &sampler_desc, &tmp_sampler); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + refcount = ID3D11SamplerState_Release(tmp_sampler); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + + ID3D11DeviceContext_Release(context); + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_device_context_state(void) { ID3DDeviceContextState *context_state, *previous_context_state; @@ -17679,6 +17744,7 @@ START_TEST(d3d11) test_timestamp_query(); test_device_removed_reason(); test_private_data(); + run_for_each_feature_level(test_state_refcounting); test_device_context_state(); test_blend(); test_texture();

1 0

Józef Kucia : d3d11: Fix refcounting for shaders.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: 51d58f9962c92bb2268143383499b1e9b68d12fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d58f9962c92bb2268143383… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:19:57 2017 +0200 d3d11: Fix refcounting for shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/shader.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 6266a34..b8c50d9 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -635,6 +635,14 @@ static ULONG STDMETHODCALLTYPE d3d11_hull_shader_AddRef(ID3D11HullShader *iface) TRACE("%p increasing refcount to %u.\n", shader, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(shader->device); + wined3d_mutex_lock(); + wined3d_shader_incref(shader->wined3d_shader); + wined3d_mutex_unlock(); + } + return refcount; } @@ -831,6 +839,14 @@ static ULONG STDMETHODCALLTYPE d3d11_domain_shader_AddRef(ID3D11DomainShader *if TRACE("%p increasing refcount to %u.\n", shader, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(shader->device); + wined3d_mutex_lock(); + wined3d_shader_incref(shader->wined3d_shader); + wined3d_mutex_unlock(); + } + return refcount; } @@ -1037,6 +1053,14 @@ static ULONG STDMETHODCALLTYPE d3d11_geometry_shader_AddRef(ID3D11GeometryShader TRACE("%p increasing refcount to %u.\n", shader, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(shader->device); + wined3d_mutex_lock(); + wined3d_shader_incref(shader->wined3d_shader); + wined3d_mutex_unlock(); + } + return refcount; } @@ -1890,6 +1914,14 @@ static ULONG STDMETHODCALLTYPE d3d11_compute_shader_AddRef(ID3D11ComputeShader * TRACE("%p increasing refcount to %u.\n", shader, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(shader->device); + wined3d_mutex_lock(); + wined3d_shader_incref(shader->wined3d_shader); + wined3d_mutex_unlock(); + } + return refcount; }

1 0

Józef Kucia : d3d11/tests: Introduce check_interface( ) helper.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: 31f9c920b7b93b19de4a9e1b55f0163ef07d5307 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f9c920b7b93b19de4a9e1b5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:19:58 2017 +0200 d3d11/tests: Introduce check_interface() helper. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 214 ++++++++++++++++------------------------------- 1 file changed, 73 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31f9c920b7b93b19de4a9…

1 0

Józef Kucia : d3d11/tests: Extend test for ID3DDeviceContextState.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: faecb8eda4b0360f5d60d3a989fb3cfed779df0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=faecb8eda4b0360f5d60d3a98… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:19:59 2017 +0200 d3d11/tests: Extend test for ID3DDeviceContextState. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a692473..23fbecf 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5314,6 +5314,9 @@ static void test_device_context_state(void) return; } + check_interface(device, &IID_ID3D10Device, FALSE, FALSE); + check_interface(device, &IID_ID3D10Device1, FALSE, FALSE); + feature_level = ID3D11Device1_GetFeatureLevel(device); ID3D11Device1_GetImmediateContext1(device, &context); @@ -5334,7 +5337,7 @@ static void test_device_context_state(void) ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &sampler); - tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + tmp_sampler = NULL; ID3D11DeviceContext1_PSGetSamplers(context, 0, 1, &tmp_sampler); ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); ID3D11SamplerState_Release(tmp_sampler); @@ -5347,7 +5350,7 @@ static void test_device_context_state(void) ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); /* Enable ID3D10Device behavior. */ - previous_context_state = (ID3DDeviceContextState *)0xdeadbeef; + previous_context_state = NULL; ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &previous_context_state); refcount = ID3DDeviceContextState_Release(context_state); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); @@ -5358,18 +5361,35 @@ static void test_device_context_state(void) ok(tmp_sampler == (ID3D11SamplerState *)0xdeadbeef, "Got unexpected sampler %p.\n", tmp_sampler); ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &tmp_sampler); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); + check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); + ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &context_state); refcount = ID3DDeviceContextState_Release(context_state); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); refcount = ID3DDeviceContextState_Release(previous_context_state); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); - ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &sampler); + /* ID3DDeviceContextState retains the previous state. */ + tmp_sampler = NULL; + ID3D11DeviceContext1_PSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + + tmp_sampler = NULL; + ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &tmp_sampler); tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; ID3D11DeviceContext1_PSGetSamplers(context, 0, 1, &tmp_sampler); + ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = NULL; + ID3D11DeviceContext1_PSGetSamplers(context, 0, 1, &tmp_sampler); ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); ID3D11SamplerState_Release(tmp_sampler); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); + check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); + ID3D11SamplerState_Release(sampler); ID3D11DeviceContext1_Release(context); refcount = ID3D11Device1_Release(device);

1 0