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

Józef Kucia : d3d10core/tests: Add test for texturing with custom shader resource views.
by Alexandre Julliard 10 Jun '16

10 Jun '16

Module: wine Branch: master Commit: d048d5c201ac8586a1d78a27b84edbf26f956179 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d048d5c201ac8586a1d78a27b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 10 12:07:03 2016 +0200 d3d10core/tests: Add test for texturing with custom shader resource views. 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 | 168 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 158 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d048d5c201ac8586a1d78…

1 0

Józef Kucia : wined3d: Recognize SM 4.1 gather4 opcode.
by Alexandre Julliard 10 Jun '16

10 Jun '16

Module: wine Branch: master Commit: e0c4b23e942d06f929448e0ec6b3428c85ab643c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0c4b23e942d06f929448e0ec… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 10 12:07:04 2016 +0200 wined3d: Recognize SM 4.1 gather4 opcode. 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/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2c510b7..70d7d34 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5276,6 +5276,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_FRC */ shader_hw_map2gl, /* WINED3DSIH_FTOI */ NULL, /* WINED3DSIH_FTOU */ NULL, + /* WINED3DSIH_GATHER4 */ NULL, /* WINED3DSIH_GE */ NULL, /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ NULL, /* WINED3DSIH_HS_DECLS */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 92849db..9bbf461 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8610,6 +8610,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_FRC */ shader_glsl_map2gl, /* WINED3DSIH_FTOI */ shader_glsl_to_int, /* WINED3DSIH_FTOU */ shader_glsl_to_uint, + /* WINED3DSIH_GATHER4 */ NULL, /* WINED3DSIH_GE */ shader_glsl_relop, /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ NULL, /* WINED3DSIH_HS_DECLS */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index bd8d55d..f8fdc50 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -108,6 +108,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_FRC */ "frc", /* WINED3DSIH_FTOI */ "ftoi", /* WINED3DSIH_FTOU */ "ftou", + /* WINED3DSIH_GATHER4 */ "gather4", /* WINED3DSIH_GE */ "ge", /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ "hs_control_point_phase", /* WINED3DSIH_HS_DECLS */ "hs_decls", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ef5fcd2..bff1f27 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -200,6 +200,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DCL_OUTPUT_SIV = 0x67, WINED3D_SM4_OP_DCL_TEMPS = 0x68, WINED3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a, + WINED3D_SM4_OP_GATHER4 = 0x6d, WINED3D_SM5_OP_HS_DECLS = 0x71, WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE = 0x72, WINED3D_SM5_OP_HS_FORK_PHASE = 0x73, @@ -733,6 +734,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm4_read_declaration_count}, {WINED3D_SM4_OP_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_GLOBAL_FLAGS, "", "", shader_sm4_read_dcl_global_flags}, + {WINED3D_SM4_OP_GATHER4, WINED3DSIH_GATHER4, "u", "fRS"}, {WINED3D_SM5_OP_HS_DECLS, WINED3DSIH_HS_DECLS, "", ""}, {WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE, WINED3DSIH_HS_CONTROL_POINT_PHASE, "", ""}, {WINED3D_SM5_OP_HS_FORK_PHASE, WINED3DSIH_HS_FORK_PHASE, "", ""}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 82d4712..7f45327 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -615,6 +615,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_FRC, WINED3DSIH_FTOI, WINED3DSIH_FTOU, + WINED3DSIH_GATHER4, WINED3DSIH_GE, WINED3DSIH_HS_CONTROL_POINT_PHASE, WINED3DSIH_HS_DECLS,

1 0

Józef Kucia : wined3d: Recognize SM 5 gather4_c opcode.
by Alexandre Julliard 10 Jun '16

10 Jun '16

Module: wine Branch: master Commit: 5c390537912384b9f2c0d3bf5fc508ab9cff89e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c390537912384b9f2c0d3bf5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 10 12:07:05 2016 +0200 wined3d: Recognize SM 5 gather4_c opcode. 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/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 70d7d34..5ac70ad 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5277,6 +5277,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_FTOI */ NULL, /* WINED3DSIH_FTOU */ NULL, /* WINED3DSIH_GATHER4 */ NULL, + /* WINED3DSIH_GATHER4_C */ NULL, /* WINED3DSIH_GE */ NULL, /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ NULL, /* WINED3DSIH_HS_DECLS */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9bbf461..55affc1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8611,6 +8611,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_FTOI */ shader_glsl_to_int, /* WINED3DSIH_FTOU */ shader_glsl_to_uint, /* WINED3DSIH_GATHER4 */ NULL, + /* WINED3DSIH_GATHER4_C */ NULL, /* WINED3DSIH_GE */ shader_glsl_relop, /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ NULL, /* WINED3DSIH_HS_DECLS */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f8fdc50..55de679 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -109,6 +109,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_FTOI */ "ftoi", /* WINED3DSIH_FTOU */ "ftou", /* WINED3DSIH_GATHER4 */ "gather4", + /* WINED3DSIH_GATHER4_C */ "gather4_c", /* WINED3DSIH_GE */ "ge", /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ "hs_control_point_phase", /* WINED3DSIH_HS_DECLS */ "hs_decls", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index bff1f27..45a3d04 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -209,6 +209,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTX_FINE = 0x7b, WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, + WINED3D_SM5_OP_GATHER4_C = 0x7e, WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT = 0x93, WINED3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT = 0x94, WINED3D_SM5_OP_DCL_TESSELLATOR_DOMAIN = 0x95, @@ -743,6 +744,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTX_FINE, WINED3DSIH_DSX_FINE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, + {WINED3D_SM5_OP_GATHER4_C, WINED3DSIH_GATHER4_C, "f", "fRSf"}, {WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, "", "", shader_sm5_read_control_point_count}, {WINED3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT, "", "", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7f45327..7207523 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -616,6 +616,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_FTOI, WINED3DSIH_FTOU, WINED3DSIH_GATHER4, + WINED3DSIH_GATHER4_C, WINED3DSIH_GE, WINED3DSIH_HS_CONTROL_POINT_PHASE, WINED3DSIH_HS_DECLS,

1 0

Nikolay Sivov : msscript: Claim success in InitNew().
by Alexandre Julliard 10 Jun '16

10 Jun '16

Module: wine Branch: master Commit: 75e3fe6259c669ad0ceb8a2883da0438b37555c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75e3fe6259c669ad0ceb8a288… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 9 20:40:13 2016 +0300 msscript: Claim success in InitNew(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index efa20c0..a586c50 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -762,7 +762,7 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) FIXME("(%p)\n", This); - return E_NOTIMPL; + return S_OK; } static const IPersistStreamInitVtbl PersistStreamInitVtbl = {

1 0

Nikolay Sivov : msscript: Added IOleControl stub.
by Alexandre Julliard 10 Jun '16

10 Jun '16

Module: wine Branch: master Commit: 60e645c52022c57df8660b65906d5ffe05960dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60e645c52022c57df8660b659… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 9 20:40:14 2016 +0300 msscript: Added IOleControl stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 80 ++++++++++++++++++++++++++++++++++++-- dlls/msscript.ocx/tests/msscript.c | 13 +++++++ 2 files changed, 90 insertions(+), 3 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index a586c50..b2f4e77 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -33,6 +33,7 @@ struct ScriptControl { IScriptControl IScriptControl_iface; IPersistStreamInit IPersistStreamInit_iface; IOleObject IOleObject_iface; + IOleControl IOleControl_iface; LONG ref; IOleClientSite *site; SIZEL extent; @@ -134,6 +135,11 @@ static inline ScriptControl *impl_from_IPersistStreamInit(IPersistStreamInit *if return CONTAINING_RECORD(iface, ScriptControl, IPersistStreamInit_iface); } +static inline ScriptControl *impl_from_IOleControl(IOleControl *iface) +{ + return CONTAINING_RECORD(iface, ScriptControl, IOleControl_iface); +} + static HRESULT WINAPI ScriptControl_QueryInterface(IScriptControl *iface, REFIID riid, void **ppv) { ScriptControl *This = impl_from_IScriptControl(iface); @@ -148,14 +154,17 @@ static HRESULT WINAPI ScriptControl_QueryInterface(IScriptControl *iface, REFIID TRACE("(%p)->(IID_IScriptControl %p)\n", This, ppv); *ppv = &This->IScriptControl_iface; }else if(IsEqualGUID(&IID_IOleObject, riid)) { - TRACE("(%p)->(IID_IOleObject %p\n", This, ppv); + TRACE("(%p)->(IID_IOleObject %p)\n", This, ppv); *ppv = &This->IOleObject_iface; }else if(IsEqualGUID(&IID_IPersistStreamInit, riid)) { - TRACE("(%p)->(IID_IPersistStreamInit %p\n", This, ppv); + TRACE("(%p)->(IID_IPersistStreamInit %p)\n", This, ppv); *ppv = &This->IPersistStreamInit_iface; }else if(IsEqualGUID(&IID_IPersist, riid)) { - TRACE("(%p)->(IID_IPersist %p\n", This, ppv); + TRACE("(%p)->(IID_IPersist %p)\n", This, ppv); *ppv = &This->IPersistStreamInit_iface; + }else if(IsEqualGUID(&IID_IOleControl, riid)) { + TRACE("(%p)->(IID_IOleControl %p)\n", This, ppv); + *ppv = &This->IOleControl_iface; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -777,6 +786,70 @@ static const IPersistStreamInitVtbl PersistStreamInitVtbl = { PersistStreamInit_InitNew }; +static HRESULT WINAPI OleControl_QueryInterface(IOleControl *iface, REFIID riid, void **obj) +{ + ScriptControl *This = impl_from_IOleControl(iface); + return IScriptControl_QueryInterface(&This->IScriptControl_iface, riid, obj); +} + +static ULONG WINAPI OleControl_AddRef(IOleControl *iface) +{ + ScriptControl *This = impl_from_IOleControl(iface); + return IScriptControl_AddRef(&This->IScriptControl_iface); +} + +static ULONG WINAPI OleControl_Release(IOleControl *iface) +{ + ScriptControl *This = impl_from_IOleControl(iface); + return IScriptControl_Release(&This->IScriptControl_iface); +} + +static HRESULT WINAPI OleControl_GetControlInfo(IOleControl *iface, CONTROLINFO *info) +{ + ScriptControl *This = impl_from_IOleControl(iface); + + FIXME("(%p)->(%p)\n", This, info); + + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_OnMnemonic(IOleControl *iface, MSG *msg) +{ + ScriptControl *This = impl_from_IOleControl(iface); + + FIXME("(%p)->(%p)\n", This, msg); + + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DISPID dispid) +{ + ScriptControl *This = impl_from_IOleControl(iface); + + FIXME("(%p)->(%#x)\n", This, dispid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_FreezeEvents(IOleControl *iface, BOOL freeze) +{ + ScriptControl *This = impl_from_IOleControl(iface); + + FIXME("(%p)->(%d)\n", This, freeze); + + return E_NOTIMPL; +} + +static const IOleControlVtbl OleControlVtbl = { + OleControl_QueryInterface, + OleControl_AddRef, + OleControl_Release, + OleControl_GetControlInfo, + OleControl_OnMnemonic, + OleControl_OnAmbientPropertyChange, + OleControl_FreezeEvents +}; + static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { ScriptControl *script_control; @@ -793,6 +866,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->IScriptControl_iface.lpVtbl = &ScriptControlVtbl; script_control->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; script_control->IOleObject_iface.lpVtbl = &OleObjectVtbl; + script_control->IOleControl_iface.lpVtbl = &OleControlVtbl; script_control->ref = 1; script_control->site = NULL; diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 6dd7d67..f0245a6 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -178,6 +178,18 @@ static void test_persiststreaminit(void) IPersistStreamInit_Release(init); } +static void test_olecontrol(void) +{ + IOleControl *olecontrol; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IOleControl, (void**)&olecontrol); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IOleControl_Release(olecontrol); +} + START_TEST(msscript) { IUnknown *unk; @@ -195,6 +207,7 @@ START_TEST(msscript) test_oleobject(); test_persiststreaminit(); + test_olecontrol(); CoUninitialize(); }

1 0

Józef Kucia : d3d11/tests: Add more tests for creating render target views.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 6252bd2b63164c64a644153cce9dc5469531c9a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6252bd2b63164c64a644153cc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 8 14:54:59 2016 +0200 d3d11/tests: Add more tests for creating render target views. 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 | 264 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 202 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6252bd2b63164c64a6441…

1 0

Józef Kucia : d3d11: Normalize "ArraySize" field in D3D11_DEPTH_STENCIL_VIEW_DESC.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 6b1bd3ded0211380cabc931b4aed2f826447d47f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b1bd3ded0211380cabc931b4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 8 14:55:00 2016 +0200 d3d11: Normalize "ArraySize" field in D3D11_DEPTH_STENCIL_VIEW_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/view.c | 56 +++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 5a2ef39..7f5abf7 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -124,50 +124,50 @@ static HRESULT set_dsdesc_from_resource(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3 static void normalize_dsv_desc(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Resource *resource) { D3D11_RESOURCE_DIMENSION dimension; - - if (desc->Format != DXGI_FORMAT_UNKNOWN) - return; + unsigned int layer_count; + DXGI_FORMAT format; ID3D11Resource_GetType(resource, &dimension); switch (dimension) { - case D3D11_RESOURCE_DIMENSION_TEXTURE1D: + case D3D11_RESOURCE_DIMENSION_TEXTURE2D: { - D3D11_TEXTURE1D_DESC texture_desc; - ID3D11Texture1D *texture; + const struct d3d_texture2d *texture; - if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Texture1D, (void **)&texture))) + if (!(texture = unsafe_impl_from_ID3D11Texture2D((ID3D11Texture2D *)resource))) { - ERR("Resource of type TEXTURE1D doesn't implement ID3D11Texture1D.\n"); - break; + ERR("Cannot get implementation from ID3D11Texture2D.\n"); + return; } - ID3D11Texture1D_GetDesc(texture, &texture_desc); - ID3D11Texture1D_Release(texture); - - if (desc->Format == DXGI_FORMAT_UNKNOWN) - desc->Format = texture_desc.Format; + format = texture->desc.Format; + layer_count = texture->desc.ArraySize; break; } - case D3D11_RESOURCE_DIMENSION_TEXTURE2D: - { - D3D11_TEXTURE2D_DESC texture_desc; - ID3D11Texture2D *texture; + default: + return; + } - if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Texture2D, (void **)&texture))) - { - ERR("Resource of type TEXTURE2D doesn't implement ID3D11Texture2D.\n"); - break; - } + if (desc->Format == DXGI_FORMAT_UNKNOWN) + desc->Format = format; - ID3D11Texture2D_GetDesc(texture, &texture_desc); - ID3D11Texture2D_Release(texture); + switch (desc->ViewDimension) + { + case D3D11_DSV_DIMENSION_TEXTURE1DARRAY: + if (desc->u.Texture1DArray.ArraySize == -1 && desc->u.Texture1DArray.FirstArraySlice < layer_count) + desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.ArraySize; + break; + + case D3D11_DSV_DIMENSION_TEXTURE2DARRAY: + if (desc->u.Texture2DArray.ArraySize == -1 && desc->u.Texture2DArray.FirstArraySlice < layer_count) + desc->u.Texture2DArray.ArraySize = layer_count - desc->u.Texture2DArray.FirstArraySlice; + break; - if (desc->Format == DXGI_FORMAT_UNKNOWN) - desc->Format = texture_desc.Format; + case D3D11_DSV_DIMENSION_TEXTURE2DMSARRAY: + if (desc->u.Texture2DMSArray.ArraySize == -1 && desc->u.Texture2DMSArray.FirstArraySlice < layer_count) + desc->u.Texture2DMSArray.ArraySize = layer_count - desc->u.Texture2DMSArray.FirstArraySlice; break; - } default: break;

1 0

Józef Kucia : d3d11/tests: Add more tests for creating depth stencil views.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: d5f383ca53c3d8fcce56e2f34a0570b6a601c5fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5f383ca53c3d8fcce56e2f34… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 8 14:55:01 2016 +0200 d3d11/tests: Add more tests for creating depth stencil views. 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 | 168 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 136 insertions(+), 32 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b519e39..0f811ec 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -279,6 +279,72 @@ static void check_rtv_desc_(unsigned int line, const D3D11_RENDER_TARGET_VIEW_DE } } +struct dsv_desc +{ + DXGI_FORMAT format; + D3D11_DSV_DIMENSION dimension; + unsigned int miplevel_idx; + unsigned int layer_idx; + unsigned int layer_count; +}; + +static void get_dsv_desc(D3D11_DEPTH_STENCIL_VIEW_DESC *d3d11_desc, const struct dsv_desc *desc) +{ + d3d11_desc->Format = desc->format; + d3d11_desc->ViewDimension = desc->dimension; + d3d11_desc->Flags = 0; + if (desc->dimension == D3D11_DSV_DIMENSION_TEXTURE2D) + { + U(*d3d11_desc).Texture2D.MipSlice = desc->miplevel_idx; + } + else if (desc->dimension == D3D11_DSV_DIMENSION_TEXTURE2DARRAY) + { + U(*d3d11_desc).Texture2DArray.MipSlice = desc->miplevel_idx; + U(*d3d11_desc).Texture2DArray.FirstArraySlice = desc->layer_idx; + U(*d3d11_desc).Texture2DArray.ArraySize = desc->layer_count; + } + else + { + trace("Unhandled view dimension %#x.\n", desc->dimension); + } +} + +#define check_dsv_desc(a, b) check_dsv_desc_(__LINE__, a, b) +static void check_dsv_desc_(unsigned int line, const D3D11_DEPTH_STENCIL_VIEW_DESC *desc, + const struct dsv_desc *expected_desc) +{ + ok_(__FILE__, line)(desc->Format == expected_desc->format, + "Got format %#x, expected %#x.\n", desc->Format, expected_desc->format); + ok_(__FILE__, line)(desc->ViewDimension == expected_desc->dimension, + "Got view dimension %#x, expected %#x.\n", desc->ViewDimension, expected_desc->dimension); + + if (desc->ViewDimension != expected_desc->dimension) + return; + + if (desc->ViewDimension == D3D11_DSV_DIMENSION_TEXTURE2D) + { + ok_(__FILE__, line)(U(*desc).Texture2D.MipSlice == expected_desc->miplevel_idx, + "Got MipSlice %u, expected %u.\n", + U(*desc).Texture2D.MipSlice, expected_desc->miplevel_idx); + } + else if (desc->ViewDimension == D3D11_DSV_DIMENSION_TEXTURE2DARRAY) + { + ok_(__FILE__, line)(U(*desc).Texture2DArray.MipSlice == expected_desc->miplevel_idx, + "Got MipSlice %u, expected %u.\n", + U(*desc).Texture2DArray.MipSlice, expected_desc->miplevel_idx); + ok_(__FILE__, line)(U(*desc).Texture2DArray.FirstArraySlice == expected_desc->layer_idx, + "Got FirstArraySlice %u, expected %u.\n", + U(*desc).Texture2DArray.FirstArraySlice, expected_desc->layer_idx); + ok_(__FILE__, line)(U(*desc).Texture2DArray.ArraySize == expected_desc->layer_count, + "Got ArraySize %u, expected %u.\n", + U(*desc).Texture2DArray.ArraySize, expected_desc->layer_count); + } + else + { + trace("Unhandled view dimension %#x.\n", desc->ViewDimension); + } +} + #define create_buffer(a, b, c, d) create_buffer_(__LINE__, a, b, c, d) static ID3D11Buffer *create_buffer_(unsigned int line, ID3D11Device *device, unsigned int bind_flags, unsigned int size, const void *data) @@ -1948,8 +2014,48 @@ static void test_create_depthstencil_view(void) ID3D11DepthStencilView *dsview; ID3D11Device *device, *tmp; ID3D11Texture2D *texture; + IUnknown *iface; + unsigned int i; HRESULT hr; + static const struct + { + struct + { + unsigned int miplevel_count; + unsigned int array_size; + DXGI_FORMAT format; + } texture; + struct dsv_desc dsv_desc; + struct dsv_desc expected_dsv_desc; + } + tests[] = + { +#define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN +#define D24_S8 DXGI_FORMAT_D24_UNORM_S8_UINT +#define TEX_2D D3D11_DSV_DIMENSION_TEXTURE2D +#define TEX_2D_ARRAY D3D11_DSV_DIMENSION_TEXTURE2DARRAY + {{ 1, 1, D24_S8}, {0}, {D24_S8, TEX_2D, 0}}, + {{10, 1, D24_S8}, {0}, {D24_S8, TEX_2D, 0}}, + {{10, 1, D24_S8}, {FMT_UNKNOWN, TEX_2D, 0}, {D24_S8, TEX_2D, 0}}, + {{10, 1, D24_S8}, {FMT_UNKNOWN, TEX_2D, 1}, {D24_S8, TEX_2D, 1}}, + {{10, 1, D24_S8}, {FMT_UNKNOWN, TEX_2D, 9}, {D24_S8, TEX_2D, 9}}, + {{ 1, 4, D24_S8}, {0}, {D24_S8, TEX_2D_ARRAY, 0, 0, 4}}, + {{10, 4, D24_S8}, {0}, {D24_S8, TEX_2D_ARRAY, 0, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 0, -1}, {D24_S8, TEX_2D_ARRAY, 0, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 1, 0, -1}, {D24_S8, TEX_2D_ARRAY, 1, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 3, 0, -1}, {D24_S8, TEX_2D_ARRAY, 3, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 5, 0, -1}, {D24_S8, TEX_2D_ARRAY, 5, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 9, 0, -1}, {D24_S8, TEX_2D_ARRAY, 9, 0, 4}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 1, -1}, {D24_S8, TEX_2D_ARRAY, 0, 1, 3}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 2, -1}, {D24_S8, TEX_2D_ARRAY, 0, 2, 2}}, + {{10, 4, D24_S8}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 3, -1}, {D24_S8, TEX_2D_ARRAY, 0, 3, 1}}, +#undef FMT_UNKNOWN +#undef D24_S8 +#undef TEX_2D +#undef TEX_2D_ARRAY + }; + if (!(device = create_device(NULL))) { skip("Failed to create device.\n"); @@ -1993,46 +2099,44 @@ static void test_create_depthstencil_view(void) ok(!U(dsv_desc).Texture2D.MipSlice, "Got unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); ID3D11DepthStencilView_Release(dsview); + ID3D11Texture2D_Release(texture); - dsv_desc.Format = DXGI_FORMAT_UNKNOWN; - - hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, &dsv_desc, &dsview); - ok(SUCCEEDED(hr), "Failed to create a depthstencil view, hr %#x.\n", hr); + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + D3D11_DEPTH_STENCIL_VIEW_DESC *current_desc; - memset(&dsv_desc, 0, sizeof(dsv_desc)); - ID3D11DepthStencilView_GetDesc(dsview, &dsv_desc); - ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); - ok(dsv_desc.ViewDimension == D3D11_DSV_DIMENSION_TEXTURE2D, - "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); - ok(!dsv_desc.Flags, "Got unexpected flags %#x.\n", dsv_desc.Flags); - ok(!U(dsv_desc).Texture2D.MipSlice, "Got unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); + texture_desc.MipLevels = tests[i].texture.miplevel_count; + texture_desc.ArraySize = tests[i].texture.array_size; + texture_desc.Format = tests[i].texture.format; - ID3D11DepthStencilView_Release(dsview); - ID3D11Texture2D_Release(texture); + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Test %u: Failed to create 2d texture, hr %#x.\n", i, hr); - texture_desc.ArraySize = 4; + if (tests[i].dsv_desc.dimension == D3D11_DSV_DIMENSION_UNKNOWN) + { + current_desc = NULL; + } + else + { + current_desc = &dsv_desc; + get_dsv_desc(current_desc, &tests[i].dsv_desc); + } - hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, current_desc, &dsview); + ok(SUCCEEDED(hr), "Test %u: Failed to create depth stencil view, hr %#x.\n", i, hr); - hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, NULL, &dsview); - ok(SUCCEEDED(hr), "Failed to create depthstencil view, hr %#x.\n", hr); + hr = ID3D11DepthStencilView_QueryInterface(dsview, &IID_ID3D10DepthStencilView, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Test %u: Depth stencil view should implement ID3D10DepthStencilView.\n", i); + if (SUCCEEDED(hr)) IUnknown_Release(iface); - memset(&dsv_desc, 0, sizeof(dsv_desc)); - ID3D11DepthStencilView_GetDesc(dsview, &dsv_desc); - ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); - ok(dsv_desc.ViewDimension == D3D11_DSV_DIMENSION_TEXTURE2DARRAY, - "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); - ok(!dsv_desc.Flags, "Got unexpected flags %#x.\n", dsv_desc.Flags); - ok(!U(dsv_desc).Texture2DArray.MipSlice, "Got unexpected mip slice %u.\n", - U(dsv_desc).Texture2DArray.MipSlice); - ok(!U(dsv_desc).Texture2DArray.FirstArraySlice, "Got unexpected first array slice %u.\n", - U(dsv_desc).Texture2DArray.FirstArraySlice); - ok(U(dsv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, - "Got unexpected array size %u.\n", U(dsv_desc).Texture2DArray.ArraySize); + memset(&dsv_desc, 0, sizeof(dsv_desc)); + ID3D11DepthStencilView_GetDesc(dsview, &dsv_desc); + check_dsv_desc(&dsv_desc, &tests[i].expected_dsv_desc); - ID3D11DepthStencilView_Release(dsview); - ID3D11Texture2D_Release(texture); + ID3D11DepthStencilView_Release(dsview); + ID3D11Texture2D_Release(texture); + } refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Józef Kucia : d3d11: Normalize SRV descriptions for remaining view dimensions.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 026d5839ba9198fa0acc198a5d196f5f6298155a URL: http://source.winehq.org/git/wine.git/?a=commit;h=026d5839ba9198fa0acc198a5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 8 14:55:02 2016 +0200 d3d11: Normalize SRV descriptions for remaining view dimensions. 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 | 24 +++++++++- dlls/d3d11/tests/d3d11.c | 104 +++++++++++++++++++++++++++++++++--------- dlls/d3d11/view.c | 19 ++++++++ 3 files changed, 125 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=026d5839ba9198fa0acc1…

1 0

Béla Gyebrószki : wined3d: Add Nvidia GeForce GTS 250.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: a6d7a1c6e4f027b29092fa504d5fba1b7833cc24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6d7a1c6e4f027b29092fa504… Author: Béla Gyebrószki <gyebro69(a)gmail.com> Date: Wed Jun 8 18:30:23 2016 +0200 wined3d: Add Nvidia GeForce GTS 250. Signed-off-by: Béla Gyebrószki <gyebro69(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3656b8b..48feeef 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1237,6 +1237,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_210, "NVIDIA GeForce 210", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT220, "NVIDIA GeForce GT 220", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT240, "NVIDIA GeForce GT 240", DRIVER_NVIDIA_GEFORCE8, 512 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS250, "NVIDIA GeForce GTS 250", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", DRIVER_NVIDIA_GEFORCE8, 896 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", DRIVER_NVIDIA_GEFORCE8, 1024}, @@ -1833,13 +1834,13 @@ cards_nvidia_binary[] = {"GTX 280", CARD_NVIDIA_GEFORCE_GTX280}, /* Geforce 200 - highend */ {"GTX 275", CARD_NVIDIA_GEFORCE_GTX275}, /* Geforce 200 - midend high */ {"GTX 260", CARD_NVIDIA_GEFORCE_GTX260}, /* Geforce 200 - midend */ + {"GTS 250", CARD_NVIDIA_GEFORCE_GTS250}, /* Geforce 200 - midend */ {"GT 240", CARD_NVIDIA_GEFORCE_GT240}, /* Geforce 200 - midend */ {"GT 220", CARD_NVIDIA_GEFORCE_GT220}, /* Geforce 200 - lowend */ {"GeForce 310", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ {"GeForce 305", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ {"GeForce 210", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ {"G 210", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ - {"GTS 250", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"GTS 150", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"9800", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"9700M GT", CARD_NVIDIA_GEFORCE_9700MGT}, /* Geforce 9 - midend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b4bc901..82d4712 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1777,6 +1777,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_210 = 0x0a23, CARD_NVIDIA_GEFORCE_GT220 = 0x0a20, CARD_NVIDIA_GEFORCE_GT240 = 0x0ca3, + CARD_NVIDIA_GEFORCE_GTS250 = 0x0615, CARD_NVIDIA_GEFORCE_GTX260 = 0x05e2, CARD_NVIDIA_GEFORCE_GTX275 = 0x05e6, CARD_NVIDIA_GEFORCE_GTX280 = 0x05e1,

1 0