March 2016 - Wine-commits - list.winehq.org

Sebastian Lackner : ieframe: Fix implementation of impl_from_ITargetFrame2.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 68c36efd18a62f8759c4d086a99272ec8c9d0278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c36efd18a62f8759c4d086a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 04:36:36 2016 +0100 ieframe: Fix implementation of impl_from_ITargetFrame2. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/navigate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 1027313eb..88bc7e6 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -1243,7 +1243,7 @@ static const IHlinkFrameVtbl HlinkFrameVtbl = { static inline HlinkFrame *impl_from_ITargetFrame2(ITargetFrame2 *iface) { - return CONTAINING_RECORD(iface, HlinkFrame, IHlinkFrame_iface); + return CONTAINING_RECORD(iface, HlinkFrame, ITargetFrame2_iface); } static HRESULT WINAPI TargetFrame2_QueryInterface(ITargetFrame2 *iface, REFIID riid, void **ppv)

1 0

Józef Kucia : d3d11: Fill unused fields in D3D11_DEPTH_STENCIL_DESC with default values.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 6848a32c3d7c8669385089898b01ab914efd0864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6848a32c3d7c8669385089898… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 16 10:02:35 2016 +0100 d3d11: Fill unused fields in D3D11_DEPTH_STENCIL_DESC with default values. 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/device.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 845a33e..8e29303 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2233,13 +2233,37 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilState(ID3D11Devi * it as a key in the rbtree. */ memset(&tmp_desc, 0, sizeof(tmp_desc)); tmp_desc.DepthEnable = desc->DepthEnable; - tmp_desc.DepthWriteMask = desc->DepthWriteMask; - tmp_desc.DepthFunc = desc->DepthFunc; + if (desc->DepthEnable) + { + tmp_desc.DepthWriteMask = desc->DepthWriteMask; + tmp_desc.DepthFunc = desc->DepthFunc; + } + else + { + tmp_desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL; + tmp_desc.DepthFunc = D3D11_COMPARISON_LESS; + } tmp_desc.StencilEnable = desc->StencilEnable; - tmp_desc.StencilReadMask = desc->StencilReadMask; - tmp_desc.StencilWriteMask = desc->StencilWriteMask; - tmp_desc.FrontFace = desc->FrontFace; - tmp_desc.BackFace = desc->BackFace; + if (desc->StencilEnable) + { + tmp_desc.StencilReadMask = desc->StencilReadMask; + tmp_desc.StencilWriteMask = desc->StencilWriteMask; + tmp_desc.FrontFace = desc->FrontFace; + tmp_desc.BackFace = desc->BackFace; + } + else + { + tmp_desc.StencilReadMask = D3D11_DEFAULT_STENCIL_READ_MASK; + tmp_desc.StencilWriteMask = D3D11_DEFAULT_STENCIL_WRITE_MASK; + tmp_desc.FrontFace.StencilFailOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.FrontFace.StencilDepthFailOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.FrontFace.StencilPassOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.FrontFace.StencilFunc = D3D11_COMPARISON_ALWAYS; + tmp_desc.BackFace.StencilFailOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.BackFace.StencilDepthFailOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.BackFace.StencilPassOp = D3D11_STENCIL_OP_KEEP; + tmp_desc.BackFace.StencilFunc = D3D11_COMPARISON_ALWAYS; + } wined3d_mutex_lock(); if ((entry = wine_rb_get(&device->depthstencil_states, &tmp_desc)))

1 0

Józef Kucia : d3d10core/tests: Test values of unused fields in D3D10_DEPTH_STENCIL_DESC.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 3939dae06d4edbf35bd206321523deea9d404188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3939dae06d4edbf35bd206321… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 16 10:02:36 2016 +0100 d3d10core/tests: Test values of unused fields in D3D10_DEPTH_STENCIL_DESC. 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/d3d10core/tests/device.c | 47 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f31d92a..b7ac197 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2142,6 +2142,53 @@ static void test_create_depthstencil_state(void) refcount = ID3D10DepthStencilState_Release(ds_state1); ok(!refcount, "Got unexpected refcount %u.\n", refcount); + ds_desc.DepthEnable = FALSE; + ds_desc.DepthWriteMask = D3D10_DEPTH_WRITE_MASK_ZERO; + ds_desc.DepthFunc = D3D10_COMPARISON_NEVER; + ds_desc.StencilEnable = FALSE; + ds_desc.StencilReadMask = 0; + ds_desc.StencilWriteMask = 0; + ds_desc.FrontFace.StencilFailOp = D3D10_STENCIL_OP_ZERO; + ds_desc.FrontFace.StencilDepthFailOp = D3D10_STENCIL_OP_ZERO; + ds_desc.FrontFace.StencilPassOp = D3D10_STENCIL_OP_ZERO; + ds_desc.FrontFace.StencilFunc = D3D10_COMPARISON_NEVER; + ds_desc.BackFace = ds_desc.FrontFace; + + hr = ID3D10Device_CreateDepthStencilState(device, &ds_desc, &ds_state1); + ok(SUCCEEDED(hr), "Failed to create depthstencil state, hr %#x.\n", hr); + + memset(&ds_desc, 0, sizeof(ds_desc)); + ID3D10DepthStencilState_GetDesc(ds_state1, &ds_desc); + ok(!ds_desc.DepthEnable, "Got unexpected depth enable %#x.\n", ds_desc.DepthEnable); + ok(ds_desc.DepthWriteMask == D3D10_DEPTH_WRITE_MASK_ALL + || broken(ds_desc.DepthWriteMask == D3D10_DEPTH_WRITE_MASK_ZERO), + "Got unexpected depth write mask %#x.\n", ds_desc.DepthWriteMask); + ok(ds_desc.DepthFunc == D3D10_COMPARISON_LESS || broken(ds_desc.DepthFunc == D3D10_COMPARISON_NEVER), + "Got unexpected depth func %#x.\n", ds_desc.DepthFunc); + ok(!ds_desc.StencilEnable, "Got unexpected stencil enable %#x.\n", ds_desc.StencilEnable); + ok(ds_desc.StencilReadMask == D3D10_DEFAULT_STENCIL_READ_MASK, + "Got unexpected stencil read mask %#x.\n", ds_desc.StencilReadMask); + ok(ds_desc.StencilWriteMask == D3D10_DEFAULT_STENCIL_WRITE_MASK, + "Got unexpected stencil write mask %#x.\n", ds_desc.StencilWriteMask); + ok(ds_desc.FrontFace.StencilDepthFailOp == D3D10_STENCIL_OP_KEEP, + "Got unexpected front face stencil depth fail op %#x.\n", ds_desc.FrontFace.StencilDepthFailOp); + ok(ds_desc.FrontFace.StencilPassOp == D3D10_STENCIL_OP_KEEP, + "Got unexpected front face stencil pass op %#x.\n", ds_desc.FrontFace.StencilPassOp); + ok(ds_desc.FrontFace.StencilFailOp == D3D10_STENCIL_OP_KEEP, + "Got unexpected front face stencil fail op %#x.\n", ds_desc.FrontFace.StencilFailOp); + ok(ds_desc.FrontFace.StencilFunc == D3D10_COMPARISON_ALWAYS, + "Got unexpected front face stencil func %#x.\n", ds_desc.FrontFace.StencilFunc); + ok(ds_desc.BackFace.StencilDepthFailOp == D3D10_STENCIL_OP_KEEP, + "Got unexpected back face stencil depth fail op %#x.\n", ds_desc.BackFace.StencilDepthFailOp); + ok(ds_desc.BackFace.StencilPassOp == D3D10_STENCIL_OP_KEEP, + "Got unexpected back face stencil pass op %#x.\n", ds_desc.BackFace.StencilPassOp); + ok(ds_desc.BackFace.StencilFailOp == D3D10_STENCIL_OP_KEEP, + "Got unexpected back face stencil fail op %#x.\n", ds_desc.BackFace.StencilFailOp); + ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_ALWAYS, + "Got unexpected back face stencil func %#x.\n", ds_desc.BackFace.StencilFunc); + + ID3D10DepthStencilState_Release(ds_state1); + refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); }

1 0

Józef Kucia : d3d11/tests: Test values of unused fields in D3D11_DEPTH_STENCIL_DESC.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: bf88464c98bc30fa7635b7579ab700be3a541b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf88464c98bc30fa7635b7579… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 16 10:02:37 2016 +0100 d3d11/tests: Test values of unused fields in D3D11_DEPTH_STENCIL_DESC. 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 | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 81cb87f..89f9c5b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2737,6 +2737,51 @@ static void test_create_depthstencil_state(void) refcount = ID3D11DepthStencilState_Release(ds_state1); ok(!refcount, "Got unexpected refcount %u.\n", refcount); + ds_desc.DepthEnable = FALSE; + ds_desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ZERO; + ds_desc.DepthFunc = D3D11_COMPARISON_NEVER; + ds_desc.StencilEnable = FALSE; + ds_desc.StencilReadMask = 0; + ds_desc.StencilWriteMask = 0; + ds_desc.FrontFace.StencilFailOp = D3D11_STENCIL_OP_ZERO; + ds_desc.FrontFace.StencilDepthFailOp = D3D11_STENCIL_OP_ZERO; + ds_desc.FrontFace.StencilPassOp = D3D11_STENCIL_OP_ZERO; + ds_desc.FrontFace.StencilFunc = D3D11_COMPARISON_NEVER; + ds_desc.BackFace = ds_desc.FrontFace; + + hr = ID3D11Device_CreateDepthStencilState(device, &ds_desc, &ds_state1); + ok(SUCCEEDED(hr), "Failed to create depthstencil state, hr %#x.\n", hr); + + memset(&ds_desc, 0, sizeof(ds_desc)); + ID3D11DepthStencilState_GetDesc(ds_state1, &ds_desc); + ok(!ds_desc.DepthEnable, "Got unexpected depth enable %#x.\n", ds_desc.DepthEnable); + ok(ds_desc.DepthWriteMask == D3D11_DEPTH_WRITE_MASK_ALL, + "Got unexpected depth write mask %#x.\n", ds_desc.DepthWriteMask); + ok(ds_desc.DepthFunc == D3D11_COMPARISON_LESS, "Got unexpected depth func %#x.\n", ds_desc.DepthFunc); + ok(!ds_desc.StencilEnable, "Got unexpected stencil enable %#x.\n", ds_desc.StencilEnable); + ok(ds_desc.StencilReadMask == D3D11_DEFAULT_STENCIL_READ_MASK, + "Got unexpected stencil read mask %#x.\n", ds_desc.StencilReadMask); + ok(ds_desc.StencilWriteMask == D3D11_DEFAULT_STENCIL_WRITE_MASK, + "Got unexpected stencil write mask %#x.\n", ds_desc.StencilWriteMask); + ok(ds_desc.FrontFace.StencilDepthFailOp == D3D11_STENCIL_OP_KEEP, + "Got unexpected front face stencil depth fail op %#x.\n", ds_desc.FrontFace.StencilDepthFailOp); + ok(ds_desc.FrontFace.StencilPassOp == D3D11_STENCIL_OP_KEEP, + "Got unexpected front face stencil pass op %#x.\n", ds_desc.FrontFace.StencilPassOp); + ok(ds_desc.FrontFace.StencilFailOp == D3D11_STENCIL_OP_KEEP, + "Got unexpected front face stencil fail op %#x.\n", ds_desc.FrontFace.StencilFailOp); + ok(ds_desc.FrontFace.StencilFunc == D3D11_COMPARISON_ALWAYS, + "Got unexpected front face stencil func %#x.\n", ds_desc.FrontFace.StencilFunc); + ok(ds_desc.BackFace.StencilDepthFailOp == D3D11_STENCIL_OP_KEEP, + "Got unexpected back face stencil depth fail op %#x.\n", ds_desc.BackFace.StencilDepthFailOp); + ok(ds_desc.BackFace.StencilPassOp == D3D11_STENCIL_OP_KEEP, + "Got unexpected back face stencil pass op %#x.\n", ds_desc.BackFace.StencilPassOp); + ok(ds_desc.BackFace.StencilFailOp == D3D11_STENCIL_OP_KEEP, + "Got unexpected back face stencil fail op %#x.\n", ds_desc.BackFace.StencilFailOp); + ok(ds_desc.BackFace.StencilFunc == D3D11_COMPARISON_ALWAYS, + "Got unexpected back face stencil func %#x.\n", ds_desc.BackFace.StencilFunc); + + ID3D11DepthStencilState_Release(ds_state1); + refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); }

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_OMSetDepthStencilState().
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 46ba44dcb1985def29ffaf4eb0a4a36b9840f467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46ba44dcb1985def29ffaf4eb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 16 10:02:38 2016 +0100 d3d11: Implement d3d11_immediate_context_OMSetDepthStencilState(). 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 | 50 +++++++++++++++++++++++++++++++++++++++++++++- dlls/d3d11/state.c | 9 +++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index a83a754..0d2a162 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -319,6 +319,8 @@ struct d3d_depthstencil_state HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct d3d_device *device, const D3D11_DEPTH_STENCIL_DESC *desc) DECLSPEC_HIDDEN; +struct d3d_depthstencil_state *unsafe_impl_from_ID3D11DepthStencilState( + ID3D11DepthStencilState *iface) DECLSPEC_HIDDEN; struct d3d_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState( ID3D10DepthStencilState *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8e29303..ef4a7f4 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -670,7 +670,55 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3D11DeviceContext *iface, ID3D11DepthStencilState *depth_stencil_state, UINT stencil_ref) { - FIXME("iface %p, depth_stencil_state %p, stencil_ref %u stub!\n", iface, depth_stencil_state, stencil_ref); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + const D3D11_DEPTH_STENCILOP_DESC *stencil_desc; + const D3D11_DEPTH_STENCIL_DESC *desc; + + TRACE("iface %p, depth_stencil_state %p, stencil_ref %u.\n", + iface, depth_stencil_state, stencil_ref); + + wined3d_mutex_lock(); + device->stencil_ref = stencil_ref; + if (!(device->depth_stencil_state = unsafe_impl_from_ID3D11DepthStencilState(depth_stencil_state))) + { + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, TRUE); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZWRITEENABLE, D3D11_DEPTH_WRITE_MASK_ALL); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZFUNC, D3D11_COMPARISON_LESS); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILENABLE, FALSE); + wined3d_mutex_unlock(); + return; + } + + desc = &device->depth_stencil_state->desc; + + if (desc->FrontFace.StencilFailOp != desc->BackFace.StencilFailOp + || desc->FrontFace.StencilDepthFailOp != desc->BackFace.StencilDepthFailOp + || desc->FrontFace.StencilPassOp != desc->BackFace.StencilPassOp + || desc->FrontFace.StencilFunc != desc->BackFace.StencilFunc) + FIXME("Two-sided stencil testing not supported.\n"); + + stencil_desc = &desc->FrontFace; + + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, desc->DepthEnable); + if (desc->DepthEnable) + { + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZWRITEENABLE, desc->DepthWriteMask); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZFUNC, desc->DepthFunc); + } + + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILENABLE, desc->StencilEnable); + if (desc->StencilEnable) + { + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILMASK, desc->StencilReadMask); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILWRITEMASK, desc->StencilWriteMask); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILFAIL, stencil_desc->StencilFailOp); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILZFAIL, + stencil_desc->StencilDepthFailOp); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILPASS, stencil_desc->StencilPassOp); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILFUNC, stencil_desc->StencilFunc); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILREF, stencil_ref); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_SOSetTargets(ID3D11DeviceContext *iface, UINT buffer_count, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 2fc0297..665d142 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -597,6 +597,15 @@ HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct return S_OK; } +struct d3d_depthstencil_state *unsafe_impl_from_ID3D11DepthStencilState(ID3D11DepthStencilState *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_depthstencil_state_vtbl); + + return impl_from_ID3D11DepthStencilState(iface); +} + struct d3d_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState(ID3D10DepthStencilState *iface) { if (!iface)

1 0

Józef Kucia : d3d11: Forward d3d10_device_OMSetDepthStencilState() to d3d11_immediate_context_OMSetDepthStencilState().
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 36c8209a58393ebcaa29fa013df1d2e9e1eb0934 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c8209a58393ebcaa29fa013… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 16 10:02:39 2016 +0100 d3d11: Forward d3d10_device_OMSetDepthStencilState() to d3d11_immediate_context_OMSetDepthStencilState(). 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/device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index ef4a7f4..a454261 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3219,12 +3219,14 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetDepthStencilState(ID3D10Device1 ID3D10DepthStencilState *depth_stencil_state, UINT stencil_ref) { struct d3d_device *device = impl_from_ID3D10Device(iface); + struct d3d_depthstencil_state *ds_state_object; TRACE("iface %p, depth_stencil_state %p, stencil_ref %u.\n", iface, depth_stencil_state, stencil_ref); - device->depth_stencil_state = unsafe_impl_from_ID3D10DepthStencilState(depth_stencil_state); - device->stencil_ref = stencil_ref; + ds_state_object = unsafe_impl_from_ID3D10DepthStencilState(depth_stencil_state); + d3d11_immediate_context_OMSetDepthStencilState(&device->immediate_context.ID3D11DeviceContext_iface, + ds_state_object ? &ds_state_object->ID3D11DepthStencilState_iface : NULL, stencil_ref); } static void STDMETHODCALLTYPE d3d10_device_SOSetTargets(ID3D10Device1 *iface,

1 0

Józef Kucia : d3d11: Introduce debug_float4().
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: bd332f53f2d7b618e313572159cd7e70e4efb0fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd332f53f2d7b618e31357215… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 16 10:02:40 2016 +0100 d3d11: Introduce debug_float4(). 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 | 33 ++++++++++++++++----------------- dlls/d3d11/utils.c | 8 ++++++++ 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 0d2a162..80a16f3 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -60,6 +60,7 @@ extern const struct wined3d_parent_ops d3d_null_wined3d_parent_ops DECLSPEC_HIDD /* 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; +const char *debug_float4(const float *values) DECLSPEC_HIDDEN; DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index a454261..5498c8b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -603,21 +603,20 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargetsAndUnord } static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11DeviceContext *iface, - ID3D11BlendState *blend_state, const FLOAT blend_factor[4], UINT sample_mask) + ID3D11BlendState *blend_state, const float blend_factor[4], UINT sample_mask) { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); static const float default_blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; const D3D11_BLEND_DESC *desc; - TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask 0x%08x.\n", - iface, blend_state, blend_factor, sample_mask); + TRACE("iface %p, blend_state %p, blend_factor %s, sample_mask 0x%08x.\n", + iface, blend_state, debug_float4(blend_factor), sample_mask); if (!blend_factor) blend_factor = default_blend_factor; if (blend_factor[0] != 1.0f || blend_factor[1] != 1.0f || blend_factor[2] != 1.0f || blend_factor[3] != 1.0f) - FIXME("Ignoring blend factor {%.8e %.8e %.8e %.8e}.\n", - blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3]); + FIXME("Ignoring blend factor %s.\n", debug_float4(blend_factor)); wined3d_mutex_lock(); memcpy(device->blend_factor, blend_factor, 4 * sizeof(*blend_factor)); @@ -946,15 +945,15 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopyStructureCount(ID3D11D } static void STDMETHODCALLTYPE d3d11_immediate_context_ClearRenderTargetView(ID3D11DeviceContext *iface, - ID3D11RenderTargetView *render_target_view, const FLOAT color_rgba[4]) + ID3D11RenderTargetView *render_target_view, const float color_rgba[4]) { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); struct d3d_rendertarget_view *view = unsafe_impl_from_ID3D11RenderTargetView(render_target_view); const struct wined3d_color color = {color_rgba[0], color_rgba[1], color_rgba[2], color_rgba[3]}; HRESULT hr; - TRACE("iface %p, render_target_view %p, color_rgba {%.8e, %.8e, %.8e, %.8e}.\n", - iface, render_target_view, color_rgba[0], color_rgba[1], color_rgba[2], color_rgba[3]); + TRACE("iface %p, render_target_view %p, color_rgba %s.\n", + iface, render_target_view, debug_float4(color_rgba)); wined3d_mutex_lock(); if (FAILED(hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, view->wined3d_view, NULL, @@ -971,10 +970,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearUnorderedAccessViewUi } static void STDMETHODCALLTYPE d3d11_immediate_context_ClearUnorderedAccessViewFloat(ID3D11DeviceContext *iface, - ID3D11UnorderedAccessView *unordered_access_view, const FLOAT values[4]) + ID3D11UnorderedAccessView *unordered_access_view, const float values[4]) { - FIXME("iface %p, unordered_access_view %p, values {%.8e %.8e %.8e %.8e} stub!\n", - iface, unordered_access_view, values[0], values[1], values[2], values[3]); + FIXME("iface %p, unordered_access_view %p, values %s stub!\n", + iface, unordered_access_view, debug_float4(values)); } static void STDMETHODCALLTYPE d3d11_immediate_context_ClearDepthStencilView(ID3D11DeviceContext *iface, @@ -3202,13 +3201,13 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetRenderTargets(ID3D10Device1 *ifa } static void STDMETHODCALLTYPE d3d10_device_OMSetBlendState(ID3D10Device1 *iface, - ID3D10BlendState *blend_state, const FLOAT blend_factor[4], UINT sample_mask) + ID3D10BlendState *blend_state, const float blend_factor[4], UINT sample_mask) { struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_blend_state *blend_state_object; - TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask 0x%08x.\n", - iface, blend_state, blend_factor, sample_mask); + TRACE("iface %p, blend_state %p, blend_factor %s, sample_mask 0x%08x.\n", + iface, blend_state, debug_float4(blend_factor), sample_mask); blend_state_object = unsafe_impl_from_ID3D10BlendState(blend_state); d3d11_immediate_context_OMSetBlendState(&device->immediate_context.ID3D11DeviceContext_iface, @@ -3378,15 +3377,15 @@ static void STDMETHODCALLTYPE d3d10_device_UpdateSubresource(ID3D10Device1 *ifac } static void STDMETHODCALLTYPE d3d10_device_ClearRenderTargetView(ID3D10Device1 *iface, - ID3D10RenderTargetView *render_target_view, const FLOAT color_rgba[4]) + ID3D10RenderTargetView *render_target_view, const float color_rgba[4]) { struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_rendertarget_view *view = unsafe_impl_from_ID3D10RenderTargetView(render_target_view); const struct wined3d_color color = {color_rgba[0], color_rgba[1], color_rgba[2], color_rgba[3]}; HRESULT hr; - TRACE("iface %p, render_target_view %p, color_rgba {%.8e, %.8e, %.8e, %.8e}.\n", - iface, render_target_view, color_rgba[0], color_rgba[1], color_rgba[2], color_rgba[3]); + TRACE("iface %p, render_target_view %p, color_rgba %s.\n", + iface, render_target_view, debug_float4(color_rgba)); wined3d_mutex_lock(); if (FAILED(hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, view->wined3d_view, NULL, diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 6d50de5..6473722 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -154,6 +154,14 @@ const char *debug_dxgi_format(DXGI_FORMAT format) #undef WINE_D3D_TO_STR +const char *debug_float4(const float *values) +{ + if (!values) + return "(null)"; + return wine_dbg_sprintf("{%.8e, %.8e, %.8e, %.8e}", + values[0], values[1], values[2], values[3]); +} + DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) { switch(format)

1 0

Henri Verbeet : opengl32: Introduce WGL_WINE_query_renderer.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: ffb27c61c03d28154945738a74d288eb1f32c6ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb27c61c03d28154945738a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 16:55:12 2016 +0100 opengl32: Introduce WGL_WINE_query_renderer. This is a fairly straightforward adaptation of GLX_MESA_query_renderer to WGL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 27 ++++++++++++++++++++++- dlls/opengl32/opengl_ext.c | 8 +++++-- dlls/opengl32/opengl_ext.h | 5 +++++ dlls/opengl32/opengl_norm.c | 8 +++++++ dlls/opengl32/wgl.c | 52 +++++++++++++++++++++++++++++++++++++++++++++ include/wine/wgl.h | 12 +++++++++++ include/wine/wgl_driver.h | 6 +++++- 7 files changed, 114 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffb27c61c03d281549457…

1 0

Henri Verbeet : winex11: Implement WGL_WINE_query_renderer on top of GLX_MESA_query_renderer.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 97e8f047a4477d7645c285edbeef762c7c5ceb3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e8f047a4477d7645c285edb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 16:55:13 2016 +0100 winex11: Implement WGL_WINE_query_renderer on top of GLX_MESA_query_renderer. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 704d62a..8177b00 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -172,6 +172,8 @@ typedef XID GLXPbuffer; /** GLX_ARB_pixel_format_float */ #define GLX_RGBA_FLOAT_BIT 0x00000004 #define GLX_RGBA_FLOAT_TYPE 0x20B9 +/** GLX_MESA_query_renderer */ +#define GLX_RENDERER_ID_MESA 0x818E /** GLX_NV_float_buffer */ #define GLX_FLOAT_COMPONENTS_NV 0x20B0 @@ -405,6 +407,10 @@ static void (*pglXFreeMemoryNV)(GLvoid *pointer); /* MESA GLX Extensions */ static void (*pglXCopySubBufferMESA)(Display *dpy, GLXDrawable drawable, int x, int y, int width, int height); static int (*pglXSwapIntervalMESA)(unsigned int interval); +static Bool (*pglXQueryCurrentRendererIntegerMESA)(int attribute, unsigned int *value); +static const char *(*pglXQueryCurrentRendererStringMESA)(int attribute); +static Bool (*pglXQueryRendererIntegerMESA)(Display *dpy, int screen, int renderer, int attribute, unsigned int *value); +static const char *(*pglXQueryRendererStringMESA)(Display *dpy, int screen, int renderer, int attribute); /* Standard OpenGL */ static void (*pglFinish)(void); @@ -730,6 +736,16 @@ static BOOL has_opengl(void) pglXCopySubBufferMESA = pglXGetProcAddressARB((const GLubyte *) "glXCopySubBufferMESA"); } + if (has_extension( WineGLInfo.glxExtensions, "GLX_MESA_query_renderer" )) + { + pglXQueryCurrentRendererIntegerMESA = pglXGetProcAddressARB( + (const GLubyte *)"glXQueryCurrentRendererIntegerMESA" ); + pglXQueryCurrentRendererStringMESA = pglXGetProcAddressARB( + (const GLubyte *)"glXQueryCurrentRendererStringMESA" ); + pglXQueryRendererIntegerMESA = pglXGetProcAddressARB( (const GLubyte *)"glXQueryRendererIntegerMESA" ); + pglXQueryRendererStringMESA = pglXGetProcAddressARB( (const GLubyte *)"glXQueryRendererStringMESA" ); + } + X11DRV_WineGL_LoadExtensions(); init_pixel_formats( gdi_display ); return TRUE; @@ -2069,6 +2085,12 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg pContextAttribList += 2; ret->numAttribs++; break; + case WGL_RENDERER_ID_WINE: + pContextAttribList[0] = GLX_RENDERER_ID_MESA; + pContextAttribList[1] = attribList[1]; + pContextAttribList += 2; + ret->numAttribs++; + break; default: ERR("Unhandled attribList pair: %#x %#x\n", attribList[0], attribList[1]); } @@ -3050,6 +3072,26 @@ static BOOL X11DRV_wglSetPixelFormatWINE(HDC hdc, int format) return set_pixel_format(hdc, format, TRUE); } +static BOOL X11DRV_wglQueryCurrentRendererIntegerWINE( GLenum attribute, GLuint *value ) +{ + return pglXQueryCurrentRendererIntegerMESA( attribute, value ); +} + +static const char *X11DRV_wglQueryCurrentRendererStringWINE( GLenum attribute ) +{ + return pglXQueryCurrentRendererStringMESA( attribute ); +} + +static BOOL X11DRV_wglQueryRendererIntegerWINE( HDC dc, GLint renderer, GLenum attribute, GLuint *value ) +{ + return pglXQueryRendererIntegerMESA( gdi_display, DefaultScreen(gdi_display), renderer, attribute, value ); +} + +static const char *X11DRV_wglQueryRendererStringWINE( HDC dc, GLint renderer, GLenum attribute ) +{ + return pglXQueryRendererStringMESA( gdi_display, DefaultScreen(gdi_display), renderer, attribute ); +} + /** * glxRequireVersion (internal) * @@ -3195,6 +3237,15 @@ static void X11DRV_WineGL_LoadExtensions(void) */ register_extension( "WGL_WINE_pixel_format_passthrough" ); opengl_funcs.ext.p_wglSetPixelFormatWINE = X11DRV_wglSetPixelFormatWINE; + + if (has_extension( WineGLInfo.glxExtensions, "GLX_MESA_query_renderer" )) + { + register_extension( "WGL_WINE_query_renderer" ); + opengl_funcs.ext.p_wglQueryCurrentRendererIntegerWINE = X11DRV_wglQueryCurrentRendererIntegerWINE; + opengl_funcs.ext.p_wglQueryCurrentRendererStringWINE = X11DRV_wglQueryCurrentRendererStringWINE; + opengl_funcs.ext.p_wglQueryRendererIntegerWINE = X11DRV_wglQueryRendererIntegerWINE; + opengl_funcs.ext.p_wglQueryRendererStringWINE = X11DRV_wglQueryRendererStringWINE; + } }

1 0

Henri Verbeet : wined3d: Use WGL_WINE_query_renderer to query GPU information.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 1b483f32adbc372cc02530ebab8444c773587c3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b483f32adbc372cc02530eba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 16:55:14 2016 +0100 wined3d: Use WGL_WINE_query_renderer to query GPU information. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 145 +++++++++++++++++++++++++++------------------- dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 87 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b483f32adbc372cc0253…

1 0