wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Alexandre Julliard : wineps.drv: Reset the device path once it has been painted.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: e0f3f020c0572c05673fe3c8189512948472092c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f3f020c0572c05673fe3c81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 16 00:36:06 2016 +0900 wineps.drv: Reset the device path once it has been painted. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/graphics.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index 711ab43..7fa0727 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -516,7 +516,11 @@ static BOOL paint_path( PHYSDEV dev, BOOL stroke, BOOL fill ) int i, size = GetPath( dev->hdc, NULL, NULL, 0 ); if (size == -1) return FALSE; - if (!size) return TRUE; + if (!size) + { + AbortPath( dev->hdc ); + return TRUE; + } points = HeapAlloc( GetProcessHeap(), 0, size * sizeof(*points) ); types = HeapAlloc( GetProcessHeap(), 0, size * sizeof(*types) ); if (!points || !types) goto done; @@ -549,6 +553,7 @@ static BOOL paint_path( PHYSDEV dev, BOOL stroke, BOOL fill ) if (stroke) PSDRV_DrawLine(dev); else PSDRV_WriteNewPath(dev); PSDRV_ResetClip(dev); + AbortPath( dev->hdc ); done: HeapFree( GetProcessHeap(), 0, points );

1 0

Alexandre Julliard : gdi32/tests: Add a few more path tests.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: bd53a012b4f8bf2fdb6f6c97157e929ab52fdde5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd53a012b4f8bf2fdb6f6c971… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 16 00:25:03 2016 +0900 gdi32/tests: Add a few more path tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/path.c | 53 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 48 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 223a027..f7ed012 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -38,6 +38,7 @@ static void test_path_state(void) BYTE buffer[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)]; BITMAPINFO *bi = (BITMAPINFO *)buffer; HDC hdc; + HRGN rgn; HBITMAP orig, dib; void *bits; BOOL ret; @@ -139,6 +140,12 @@ static void test_path_state(void) "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); + rgn = PathToRegion( hdc ); + ok( !rgn, "PathToRegion succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); ret = EndPath( hdc ); ok( !ret, "SelectClipPath succeeded\n" ); ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), @@ -202,6 +209,15 @@ static void test_path_state(void) AbortPath( hdc ); BeginPath( hdc ); + Rectangle( hdc, 1, 1, 10, 10 ); /* region needs some contents */ + SetLastError( 0xdeadbeef ); + rgn = PathToRegion( hdc ); + ok( !rgn, "PathToRegion succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + AbortPath( hdc ); + BeginPath( hdc ); ret = CloseFigure( hdc ); ok( ret, "CloseFigure failed\n" ); @@ -211,39 +227,66 @@ static void test_path_state(void) EndPath( hdc ); ret = WidenPath( hdc ); ok( ret, "WidenPath failed\n" ); + ok( GetPath( hdc, NULL, NULL, 0 ) != -1, "path deleted\n" ); AbortPath( hdc ); BeginPath( hdc ); EndPath( hdc ); ret = FlattenPath( hdc ); ok( ret, "FlattenPath failed\n" ); + ok( GetPath( hdc, NULL, NULL, 0 ) != -1, "path deleted\n" ); AbortPath( hdc ); BeginPath( hdc ); EndPath( hdc ); ret = StrokePath( hdc ); ok( ret, "StrokePath failed\n" ); + ok( GetPath( hdc, NULL, NULL, 0 ) == -1, "path not deleted\n" ); - AbortPath( hdc ); BeginPath( hdc ); EndPath( hdc ); ret = FillPath( hdc ); ok( ret, "FillPath failed\n" ); + ok( GetPath( hdc, NULL, NULL, 0 ) == -1, "path not deleted\n" ); - AbortPath( hdc ); BeginPath( hdc ); EndPath( hdc ); ret = StrokeAndFillPath( hdc ); ok( ret, "StrokeAndFillPath failed\n" ); + ok( GetPath( hdc, NULL, NULL, 0 ) == -1, "path not deleted\n" ); - AbortPath( hdc ); BeginPath( hdc ); Rectangle( hdc, 1, 1, 10, 10 ); /* region needs some contents */ EndPath( hdc ); ret = SelectClipPath( hdc, RGN_OR ); ok( ret, "SelectClipPath failed\n" ); + ok( GetPath( hdc, NULL, NULL, 0 ) == -1, "path not deleted\n" ); + + BeginPath( hdc ); + EndPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = SelectClipPath( hdc, RGN_OR ); + todo_wine ok( !ret, "SelectClipPath succeeded on empty path\n" ); + ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + ok( GetPath( hdc, NULL, NULL, 0 ) == -1, "path not deleted\n" ); + + BeginPath( hdc ); + Rectangle( hdc, 1, 1, 10, 10 ); /* region needs some contents */ + EndPath( hdc ); + rgn = PathToRegion( hdc ); + ok( rgn != 0, "PathToRegion failed\n" ); + DeleteObject( rgn ); + ok( GetPath( hdc, NULL, NULL, 0 ) == -1, "path not deleted\n" ); + + BeginPath( hdc ); + EndPath( hdc ); + SetLastError( 0xdeadbeef ); + rgn = PathToRegion( hdc ); + todo_wine ok( !rgn, "PathToRegion succeeded on empty path\n" ); + ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + DeleteObject( rgn ); + ok( GetPath( hdc, NULL, NULL, 0 ) == -1, "path not deleted\n" ); - AbortPath( hdc ); BeginPath( hdc ); EndPath( hdc ); SetLastError( 0xdeadbeef ); @@ -257,7 +300,7 @@ static void test_path_state(void) EndPath( hdc ); SetLastError( 0xdeadbeef ); ret = EndPath( hdc ); - ok( !ret, "SelectClipPath succeeded\n" ); + ok( !ret, "EndPath succeeded\n" ); ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), "wrong error %u\n", GetLastError() );

1 0

Jacek Caban : mshtml.idl: Added IElementSelector declaration.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: a2aeb36933c54fc42d1d7b1f60c2d1dcddf0bdb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2aeb36933c54fc42d1d7b1f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 15 14:22:27 2016 +0200 mshtml.idl: Added IElementSelector declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtml.idl | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/include/mshtml.idl b/include/mshtml.idl index c73a0f5..1fe30fd 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -6100,6 +6100,28 @@ interface IHTMLElement4 : IDispatch [propget, id(DISPID_IHTMLELEMENT4_ONFOCUSOUT), displaybind, bindable] \ VARIANT onfocusout() +/***************************************************************************** + * IElementSelector interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510463-98b5-11cf-bb82-00aa00bdce0b) +] +interface IElementSelector : IDispatch +{ + [id(DISPID_IELEMENTSELECTOR_QUERYSELECTOR)] + HRESULT querySelector( + [in] BSTR v, + [out, retval] IHTMLElement **pel); + + [id(DISPID_IELEMENTSELECTOR_QUERYSELECTORALL)] + HRESULT querySelectorAll( + [in] BSTR v, + [out, retval] IHTMLDOMChildrenCollection **pel); +} + #define WINE_IELEMENTSELECTOR_DISPINTERFACE_DECL \ [id(DISPID_IELEMENTSELECTOR_QUERYSELECTOR)] \ IHTMLElement *querySelector([in] BSTR v); \

1 0

Józef Kucia : wined3d: Recognize SM5 bufinfo opcode.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: 688fc5f6d81993b6a942609f799b67f584af1e33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=688fc5f6d81993b6a942609f7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 13 10:39:36 2016 +0200 wined3d: Recognize SM5 bufinfo 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 dc4b169..94e19f7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5216,6 +5216,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_BREAK */ shader_hw_break, /* WINED3DSIH_BREAKC */ shader_hw_breakc, /* WINED3DSIH_BREAKP */ NULL, + /* WINED3DSIH_BUFINFO */ NULL, /* WINED3DSIH_CALL */ shader_hw_call, /* WINED3DSIH_CALLNZ */ NULL, /* WINED3DSIH_CASE */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7dc8fb6..0489507 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8550,6 +8550,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_BREAK */ shader_glsl_break, /* WINED3DSIH_BREAKC */ shader_glsl_breakc, /* WINED3DSIH_BREAKP */ shader_glsl_breakp, + /* WINED3DSIH_BUFINFO */ NULL, /* WINED3DSIH_CALL */ shader_glsl_call, /* WINED3DSIH_CALLNZ */ shader_glsl_callnz, /* WINED3DSIH_CASE */ shader_glsl_case, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 9e8b8d3..00c6028 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -48,6 +48,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_BREAK */ "break", /* WINED3DSIH_BREAKC */ "breakc", /* WINED3DSIH_BREAKP */ "breakp", + /* WINED3DSIH_BUFINFO */ "bufinfo", /* WINED3DSIH_CALL */ "call", /* WINED3DSIH_CALLNZ */ "callnz", /* WINED3DSIH_CASE */ "case", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index c66379d..c685e87 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -205,6 +205,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE = 0x72, WINED3D_SM5_OP_HS_FORK_PHASE = 0x73, WINED3D_SM5_OP_HS_JOIN_PHASE = 0x74, + WINED3D_SM5_OP_BUFINFO = 0x79, WINED3D_SM5_OP_DERIV_RTX_COARSE = 0x7a, WINED3D_SM5_OP_DERIV_RTX_FINE = 0x7b, WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, @@ -746,6 +747,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE, WINED3DSIH_HS_CONTROL_POINT_PHASE, "", ""}, {WINED3D_SM5_OP_HS_FORK_PHASE, WINED3DSIH_HS_FORK_PHASE, "", ""}, {WINED3D_SM5_OP_HS_JOIN_PHASE, WINED3DSIH_HS_JOIN_PHASE, "", ""}, + {WINED3D_SM5_OP_BUFINFO, WINED3DSIH_BUFINFO, "i", "U"}, {WINED3D_SM5_OP_DERIV_RTX_COARSE, WINED3DSIH_DSX_COARSE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTX_FINE, WINED3DSIH_DSX_FINE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "f", "f"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f463ce4..7e46e47 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -556,6 +556,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_BREAK, WINED3DSIH_BREAKC, WINED3DSIH_BREAKP, + WINED3DSIH_BUFINFO, WINED3DSIH_CALL, WINED3DSIH_CALLNZ, WINED3DSIH_CASE,

1 0

Józef Kucia : wined3d: Recognize SM5 store_structured opcode.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: 17b599a442580c38e1a171469b64ef04d664ac81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17b599a442580c38e1a171469… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 13 10:39:35 2016 +0200 wined3d: Recognize SM5 store_structured 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 ad38bfe..dc4b169 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5352,6 +5352,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_SLT */ shader_hw_map2gl, /* WINED3DSIH_SQRT */ NULL, /* WINED3DSIH_STORE_RAW */ NULL, + /* WINED3DSIH_STORE_STRUCTURED */ NULL, /* WINED3DSIH_STORE_UAV_TYPED */ NULL, /* WINED3DSIH_SUB */ shader_hw_map2gl, /* WINED3DSIH_SWITCH */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ab53231..7dc8fb6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8686,6 +8686,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SLT */ shader_glsl_compare, /* WINED3DSIH_SQRT */ shader_glsl_map2gl, /* WINED3DSIH_STORE_RAW */ NULL, + /* WINED3DSIH_STORE_STRUCTURED */ NULL, /* WINED3DSIH_STORE_UAV_TYPED */ NULL, /* WINED3DSIH_SUB */ shader_glsl_binop, /* WINED3DSIH_SWITCH */ shader_glsl_switch, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 57dbaef..9e8b8d3 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -184,6 +184,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_SLT */ "slt", /* WINED3DSIH_SQRT */ "sqrt", /* WINED3DSIH_STORE_RAW */ "store_raw", + /* WINED3DSIH_STORE_STRUCTURED */ "store_structured", /* WINED3DSIH_STORE_UAV_TYPED */ "store_uav_typed", /* WINED3DSIH_SUB */ "sub", /* WINED3DSIH_SWITCH */ "switch", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 885da50..c66379d 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -224,6 +224,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_LD_RAW = 0xa5, WINED3D_SM5_OP_STORE_RAW = 0xa6, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, + WINED3D_SM5_OP_STORE_STRUCTURED = 0xa8, WINED3D_SM5_OP_IMM_ATOMIC_CONSUME = 0xb3, }; @@ -773,6 +774,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_LD_RAW, WINED3DSIH_LD_RAW, "u", "iU"}, {WINED3D_SM5_OP_STORE_RAW, WINED3DSIH_STORE_RAW, "U", "iu"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "uuR"}, + {WINED3D_SM5_OP_STORE_STRUCTURED, WINED3DSIH_STORE_STRUCTURED, "U", "iiu"}, {WINED3D_SM5_OP_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_CONSUME, "u", "U"}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 46899c2..f463ce4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -692,6 +692,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_SLT, WINED3DSIH_SQRT, WINED3DSIH_STORE_RAW, + WINED3DSIH_STORE_STRUCTURED, WINED3DSIH_STORE_UAV_TYPED, WINED3DSIH_SUB, WINED3DSIH_SWITCH,

1 0

Józef Kucia : wined3d: Recognize SM5 bfi opcode.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: 8d14307f0023bb1b00ba7e6469d10b1cf6a46619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d14307f0023bb1b00ba7e646… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 13 10:39:34 2016 +0200 wined3d: Recognize SM5 bfi 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 7bdf0ee..ad38bfe 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5212,6 +5212,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ADD */ shader_hw_map2gl, /* WINED3DSIH_AND */ NULL, /* WINED3DSIH_BEM */ pshader_hw_bem, + /* WINED3DSIH_BFI */ NULL, /* WINED3DSIH_BREAK */ shader_hw_break, /* WINED3DSIH_BREAKC */ shader_hw_breakc, /* WINED3DSIH_BREAKP */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e0c7c65..ab53231 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8546,6 +8546,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ADD */ shader_glsl_binop, /* WINED3DSIH_AND */ shader_glsl_binop, /* WINED3DSIH_BEM */ shader_glsl_bem, + /* WINED3DSIH_BFI */ NULL, /* WINED3DSIH_BREAK */ shader_glsl_break, /* WINED3DSIH_BREAKC */ shader_glsl_breakc, /* WINED3DSIH_BREAKP */ shader_glsl_breakp, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a93a2f1..57dbaef 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -44,6 +44,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ADD */ "add", /* WINED3DSIH_AND */ "and", /* WINED3DSIH_BEM */ "bem", + /* WINED3DSIH_BFI */ "bfi", /* WINED3DSIH_BREAK */ "break", /* WINED3DSIH_BREAKC */ "breakc", /* WINED3DSIH_BREAKP */ "breakp", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 888f341..885da50 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -210,6 +210,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, WINED3D_SM5_OP_GATHER4_C = 0x7e, + WINED3D_SM5_OP_BFI = 0x8c, 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, @@ -749,6 +750,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {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_BFI, WINED3DSIH_BFI, "u", "uuuu"}, {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 9eba0ff..46899c2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -552,6 +552,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ADD, WINED3DSIH_AND, WINED3DSIH_BEM, + WINED3DSIH_BFI, WINED3DSIH_BREAK, WINED3DSIH_BREAKC, WINED3DSIH_BREAKP,

1 0

Józef Kucia : wined3d: Recognize SM5 imm_atomic_consume opcode.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: 62af9f6f1fcda6ead2eed4595e5e892cdc355c0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=62af9f6f1fcda6ead2eed4595… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 13 10:39:33 2016 +0200 wined3d: Recognize SM5 imm_atomic_consume 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 2b4bf45..7bdf0ee 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5292,6 +5292,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMAD */ NULL, /* WINED3DSIH_IMAX */ NULL, /* WINED3DSIH_IMIN */ NULL, + /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMUL */ NULL, /* WINED3DSIH_INE */ NULL, /* WINED3DSIH_INEG */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c8f7608..e0c7c65 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8626,6 +8626,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMAD */ shader_glsl_mad, /* WINED3DSIH_IMAX */ shader_glsl_map2gl, /* WINED3DSIH_IMIN */ shader_glsl_map2gl, + /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMUL */ shader_glsl_imul, /* WINED3DSIH_INE */ shader_glsl_relop, /* WINED3DSIH_INEG */ shader_glsl_unary_op, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index faae82f..a93a2f1 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -124,6 +124,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMAD */ "imad", /* WINED3DSIH_IMAX */ "imax", /* WINED3DSIH_IMIN */ "imin", + /* WINED3DSIH_IMM_ATOMIC_CONSUME */ "imm_atomic_consume", /* WINED3DSIH_IMUL */ "imul", /* WINED3DSIH_INE */ "ine", /* WINED3DSIH_INEG */ "ineg", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 7564850..888f341 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -223,6 +223,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_LD_RAW = 0xa5, WINED3D_SM5_OP_STORE_RAW = 0xa6, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, + WINED3D_SM5_OP_IMM_ATOMIC_CONSUME = 0xb3, }; enum wined3d_sm4_register_type @@ -770,6 +771,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_LD_RAW, WINED3DSIH_LD_RAW, "u", "iU"}, {WINED3D_SM5_OP_STORE_RAW, WINED3DSIH_STORE_RAW, "U", "iu"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "uuR"}, + {WINED3D_SM5_OP_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_CONSUME, "u", "U"}, }; static const enum wined3d_shader_register_type register_type_table[] = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 93e9ab4..9eba0ff 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -632,6 +632,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMAD, WINED3DSIH_IMAX, WINED3DSIH_IMIN, + WINED3DSIH_IMM_ATOMIC_CONSUME, WINED3DSIH_IMUL, WINED3DSIH_INE, WINED3DSIH_INEG,

1 0

Józef Kucia : wined3d: Recognize SM5 ld_raw opcode.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: c08dfc6836e4d8715f75b1086977e6de22c06527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c08dfc6836e4d8715f75b1086… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 13 10:39:32 2016 +0200 wined3d: Recognize SM5 ld_raw 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 392e6ee..2b4bf45 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5301,6 +5301,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_LABEL */ shader_hw_label, /* WINED3DSIH_LD */ NULL, /* WINED3DSIH_LD2DMS */ NULL, + /* WINED3DSIH_LD_RAW */ NULL, /* WINED3DSIH_LD_STRUCTURED */ NULL, /* WINED3DSIH_LIT */ shader_hw_map2gl, /* WINED3DSIH_LOG */ shader_hw_scalar_op, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 02a8d41..c8f7608 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8635,6 +8635,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ shader_glsl_ld, /* WINED3DSIH_LD2DMS */ NULL, + /* WINED3DSIH_LD_RAW */ NULL, /* WINED3DSIH_LD_STRUCTURED */ NULL, /* WINED3DSIH_LIT */ shader_glsl_lit, /* WINED3DSIH_LOG */ shader_glsl_scalar_op, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2073bcb..faae82f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -133,6 +133,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_LABEL */ "label", /* WINED3DSIH_LD */ "ld", /* WINED3DSIH_LD2DMS */ "ld2dms", + /* WINED3DSIH_LD_RAW */ "ld_raw", /* WINED3DSIH_LD_STRUCTURED */ "ld_structured", /* WINED3DSIH_LIT */ "lit", /* WINED3DSIH_LOG */ "log", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index fe85baa..7564850 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -220,6 +220,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, WINED3D_SM5_OP_STORE_UAV_TYPED = 0xa4, + WINED3D_SM5_OP_LD_RAW = 0xa5, WINED3D_SM5_OP_STORE_RAW = 0xa6, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, }; @@ -766,6 +767,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", "", shader_sm5_read_dcl_resource_structured}, {WINED3D_SM5_OP_STORE_UAV_TYPED, WINED3DSIH_STORE_UAV_TYPED, "U", "iu"}, + {WINED3D_SM5_OP_LD_RAW, WINED3DSIH_LD_RAW, "u", "iU"}, {WINED3D_SM5_OP_STORE_RAW, WINED3DSIH_STORE_RAW, "U", "iu"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "uuR"}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1bf95a6..93e9ab4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -641,6 +641,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_LABEL, WINED3DSIH_LD, WINED3DSIH_LD2DMS, + WINED3DSIH_LD_RAW, WINED3DSIH_LD_STRUCTURED, WINED3DSIH_LIT, WINED3DSIH_LOG,

1 0

Józef Kucia : wined3d: Recognize SM5 store_raw opcode.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: 41b296eea757b8356eaedb6c14049f26af040fed URL: http://source.winehq.org/git/wine.git/?a=commit;h=41b296eea757b8356eaedb6c1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 13 10:39:31 2016 +0200 wined3d: Recognize SM5 store_raw 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 | 4 +++- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5ac70ad..392e6ee 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5348,6 +5348,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_SINCOS */ shader_hw_sincos, /* WINED3DSIH_SLT */ shader_hw_map2gl, /* WINED3DSIH_SQRT */ NULL, + /* WINED3DSIH_STORE_RAW */ NULL, /* WINED3DSIH_STORE_UAV_TYPED */ NULL, /* WINED3DSIH_SUB */ shader_hw_map2gl, /* WINED3DSIH_SWITCH */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 719c8a2..02a8d41 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8682,6 +8682,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SINCOS */ shader_glsl_sincos, /* WINED3DSIH_SLT */ shader_glsl_compare, /* WINED3DSIH_SQRT */ shader_glsl_map2gl, + /* WINED3DSIH_STORE_RAW */ NULL, /* WINED3DSIH_STORE_UAV_TYPED */ NULL, /* WINED3DSIH_SUB */ shader_glsl_binop, /* WINED3DSIH_SWITCH */ shader_glsl_switch, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f88ccb5..2073bcb 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -180,6 +180,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_SINCOS */ "sincos", /* WINED3DSIH_SLT */ "slt", /* WINED3DSIH_SQRT */ "sqrt", + /* WINED3DSIH_STORE_RAW */ "store_raw", /* WINED3DSIH_STORE_UAV_TYPED */ "store_uav_typed", /* WINED3DSIH_SUB */ "sub", /* WINED3DSIH_SWITCH */ "switch", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 4603d9a..fe85baa 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -220,6 +220,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, WINED3D_SM5_OP_STORE_UAV_TYPED = 0xa4, + WINED3D_SM5_OP_STORE_RAW = 0xa6, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, }; @@ -764,7 +765,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm4_read_dcl_resource}, {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", "", shader_sm5_read_dcl_resource_structured}, - {WINED3D_SM5_OP_STORE_UAV_TYPED, WINED3DSIH_STORE_UAV_TYPED, "", "Uif"}, + {WINED3D_SM5_OP_STORE_UAV_TYPED, WINED3DSIH_STORE_UAV_TYPED, "U", "iu"}, + {WINED3D_SM5_OP_STORE_RAW, WINED3DSIH_STORE_RAW, "U", "iu"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "uuR"}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7ad7bac..1bf95a6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -688,6 +688,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_SINCOS, WINED3DSIH_SLT, WINED3DSIH_SQRT, + WINED3DSIH_STORE_RAW, WINED3DSIH_STORE_UAV_TYPED, WINED3DSIH_SUB, WINED3DSIH_SWITCH,

1 0

Józef Kucia : wined3d: Recognize thread group shared memory register.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: c2651c5617b92a2c224934ecc7c431f9f411a5ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2651c5617b92a2c224934ecc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 13 10:39:30 2016 +0200 wined3d: Recognize thread group shared memory register. 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/shader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 55de679..f88ccb5 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1730,6 +1730,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "vDomainLocation"); break; + case WINED3DSPR_GROUPSHAREDMEM: + shader_addline(buffer, "g"); + break; + default: shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 45a3d04..4603d9a 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -242,6 +242,7 @@ enum wined3d_sm4_register_type WINED3D_SM5_RT_PATCH_CONSTANT_DATA = 0x1b, WINED3D_SM5_RT_DOMAIN_LOCATION = 0x1c, WINED3D_SM5_RT_UAV = 0x1e, + WINED3D_SM5_RT_SHARED_MEMORY = 0x1f, }; enum wined3d_sm4_output_primitive_type @@ -800,6 +801,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM5_RT_DOMAIN_LOCATION */ WINED3DSPR_TESSCOORD, /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_UAV */ WINED3DSPR_UAV, + /* WINED3D_SM5_RT_SHARED_MEMORY */ WINED3DSPR_GROUPSHAREDMEM, }; static const struct wined3d_sm4_opcode_info *get_opcode_info(enum wined3d_sm4_opcode opcode) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ffcfb81..7ad7bac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -386,6 +386,7 @@ enum wined3d_shader_register_type WINED3DSPR_INCONTROLPOINT, WINED3DSPR_PATCHCONST, WINED3DSPR_TESSCOORD, + WINED3DSPR_GROUPSHAREDMEM, }; enum wined3d_data_type

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2016