March 2017 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : dplayx/tests: Free IDirectPlayLobby objects.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: e16abdfad1395d3703e1886838ae5f7cc8cb74e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e16abdfad1395d3703e188683… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 3 05:15:44 2017 +0000 dplayx/tests: Free IDirectPlayLobby objects. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/tests/dplayx.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 27dc9ee..2b4fda3 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -700,7 +700,7 @@ static void init_TCPIP_provider( IDirectPlay4 *pDP, LPCSTR strIPAddressString, W checkHR( DP_OK, hr ); HeapFree( GetProcessHeap(), 0, pAddress ); - + IDirectPlayLobby_Release(pDPL); } static BOOL CALLBACK EnumSessions_cb_join( LPCDPSESSIONDESC2 lpThisSD, @@ -940,6 +940,8 @@ static BOOL CALLBACK EnumConnections_cb( LPCGUID lpguidSP, callbackData->dwCounter1++; + IDirectPlayLobby_Release(pDPL); + return TRUE; } @@ -3075,7 +3077,7 @@ static void test_GetPlayerAddress(void) if ( hr == DP_OK ) { todo_wine win_skip( "GetPlayerAddress not implemented\n" ); - return; + goto cleanup; } init_TCPIP_provider( pDP[0], "127.0.0.1", 0 ); @@ -3171,9 +3173,11 @@ static void test_GetPlayerAddress(void) HeapFree( GetProcessHeap(), 0, lpData ); + +cleanup: IDirectPlayX_Release( pDP[0] ); IDirectPlayX_Release( pDP[1] ); - + IDirectPlayLobby_Release(pDPL); } /* GetPlayerFlags */

1 0

Akihiro Sagawa : iexplore: Follow translation version info to detect native IE.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: 79d01be4361dcd999ca393239dc55849f2d235c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d01be4361dcd999ca393239… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 6 23:49:41 2017 +0900 iexplore: Follow translation version info to detect native IE. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/iexplore/Makefile.in | 2 +- programs/iexplore/main.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/programs/iexplore/Makefile.in b/programs/iexplore/Makefile.in index f3fd4c2..7e74867 100644 --- a/programs/iexplore/Makefile.in +++ b/programs/iexplore/Makefile.in @@ -1,7 +1,7 @@ MODULE = iexplore.exe APPMODE = -mwindows -municode -Wl,--large-address-aware IMPORTS = ieframe -DELAYIMPORTS = advpack version +DELAYIMPORTS = advpack version user32 C_SRCS = \ main.c diff --git a/programs/iexplore/main.c b/programs/iexplore/main.c index 73fec25..b881443 100644 --- a/programs/iexplore/main.c +++ b/programs/iexplore/main.c @@ -34,14 +34,19 @@ static BOOL check_native_ie(void) LPWSTR file_desc; UINT bytes; void* buf; - BOOL ret; + BOOL ret = TRUE; + LPWORD translation; static const WCHAR browseui_dllW[] = {'b','r','o','w','s','e','u','i','.','d','l','l',0}; static const WCHAR wineW[] = {'W','i','n','e',0}; - static const WCHAR file_desc_strW[] = + static const WCHAR translationW[] = + {'\\','V','a','r','F','i','l','e','I','n','f','o', + '\\','T','r','a','n','s','l','a','t','i','o','n',0}; + static const WCHAR file_desc_fmtW[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o', - '\\','0','4','0','9','0','4','e','4', + '\\','%','0','4','x','%','0','4','x', '\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0}; + WCHAR file_desc_strW[48]; size = GetFileVersionInfoSizeW(browseui_dllW, &handle); if(!size) @@ -49,8 +54,11 @@ static BOOL check_native_ie(void) buf = HeapAlloc(GetProcessHeap(), 0, size); GetFileVersionInfoW(browseui_dllW, 0, size,buf); - - ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !strstrW(file_desc, wineW); + if (VerQueryValueW(buf, translationW, (void **)&translation, &bytes)) + { + wsprintfW(file_desc_strW, file_desc_fmtW, translation[0], translation[1]); + ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !strstrW(file_desc, wineW); + } HeapFree(GetProcessHeap(), 0, buf); return ret;

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.7.0.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: 6bf71998781afa4aa011e21cc817a29137ebbbc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bf71998781afa4aa011e21cc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Mar 3 13:22:29 2017 -0600 mscoree: Update Wine Mono to 4.7.0. This contains upstream updates from the Mono project. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index b4eb12f..c3847b5 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -64,8 +64,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.6.4" -#define MONO_SHA "d58509c3a4e5fa88c56c14e0413a803aa82f6118" +#define MONO_VERSION "4.7.0" +#define MONO_SHA "ff05e1d2a93c3a07672cefc7a8f3a087d75828ac" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 67f4259..49b319c 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -675,7 +675,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.6.4"; + static const char* mono_version = "4.7.0"; static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0};

1 0

Julian Rüger : readme: Update German translation.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: e2f677212a4b417fcb97cde2119f22b6b9ee423b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f677212a4b417fcb97cde21… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 6 17:15:07 2017 +0100 readme: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.de | 131 ++++++++++++++++++++++++------------------------ 1 file changed, 66 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2f677212a4b417fcb97c…

1 0

Henri Verbeet : usp10/tests: Add a latn shaping test with ligatures.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: 04cd6029ea7a599c78a36d6a71a4d74bef11d5de URL: http://source.winehq.org/git/wine.git/?a=commit;h=04cd6029ea7a599c78a36d6a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 2 09:38:39 2017 +0100 usp10/tests: Add a latn shaping test with ligatures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index c5cc401..b8c7b70 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1185,6 +1185,13 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, {0,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}} }; + static const WCHAR test3[] = {'t', 't', 'f', 'f', 'f', 'i', 0}; + static const shapeTest_char t3_c[] = {{0, {0, 0}}, {0, {0, 0}}, {0, {0, 0}}, + {1, {0, 0}}, {1, {0, 0}}, {1, {0, 0}}}; + static const shapeTest_glyph t3_g[] = { + {1, {{SCRIPT_JUSTIFY_CHARACTER, 1, 0, 0, 0, 0}, 0}}, + {1, {{SCRIPT_JUSTIFY_CHARACTER, 1, 0, 0, 0, 0}, 0}}}; + /* Hebrew */ static const WCHAR test_hebrew[] = {0x05e9, 0x05dc, 0x05d5, 0x05dd,0}; static const shapeTest_char hebrew_c[] = {{3,{0,0}},{2,{0,0}},{1,{0,0}},{0,{0,0}}}; @@ -1467,6 +1474,14 @@ static void test_ScriptShapeOpenType(HDC hdc) test_shape_ok(hdc, test2, 4, &Control, &State, 1, 4, t2_c, glyph_test); + test_valid = find_font_for_range(hdc, "Calibri", 0, test3[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test3, 6, &Control, &State, 0, 2, t3_c, t3_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } + test_valid = find_font_for_range(hdc, "Microsoft Sans Serif", 11, test_hebrew[0], &hfont, &hfont_orig); if (hfont != NULL) {

1 0

Henri Verbeet : usp10/tests: Add a ligature and diacritic to the syrc shaping test.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: badb0a7530c2d7c5a96eebc15b3d8dc5a0cf7f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=badb0a7530c2d7c5a96eebc15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 2 09:38:40 2017 +0100 usp10/tests: Add a ligature and diacritic to the syrc shaping test. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index b8c7b70..010e906 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1017,11 +1017,16 @@ static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, winetest_trace("%i: Glyph present when it should not be\n",x); } if (valid > 0) - winetest_ok(glyphProp[x].sva.uJustification == glyphItems[x].GlyphProp.sva.uJustification || - (props2 && glyphProp[x].sva.uJustification == props2[x].sva.uJustification), - "%i: uJustification incorrect (%i)\n",x,glyphProp[x].sva.uJustification); + { + todo_wine_if(tags[item] == syrc_tag && !x) + winetest_ok(glyphProp[x].sva.uJustification == glyphItems[x].GlyphProp.sva.uJustification || + (props2 && glyphProp[x].sva.uJustification == props2[x].sva.uJustification), + "%i: uJustification incorrect (%i)\n",x,glyphProp[x].sva.uJustification); + } else if (glyphProp[x].sva.uJustification != glyphItems[x].GlyphProp.sva.uJustification) + { winetest_trace("%i: uJustification incorrect (%i)\n",x,glyphProp[x].sva.uJustification); + } if (valid > 0) winetest_ok(glyphProp[x].sva.fClusterStart == glyphItems[x].GlyphProp.sva.fClusterStart || (props2 && glyphProp[x].sva.fClusterStart == props2[x].sva.fClusterStart), @@ -1225,12 +1230,14 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}}; /* Syriac */ - static const WCHAR test_syriac[] = {0x0710, 0x0710, 0x0710, 0x0728, 0x0718, 0x0723,0}; - static const shapeTest_char syriac_c[] = {{5,{0,0}},{4,{0,0}},{3,{0,0}},{2,{0,0}},{1,{0,0}},{0,{0,0}}}; + static const WCHAR test_syriac[] = {0x0710, 0x072c, 0x0728, 0x0742, 0x0718, 0x0723, 0x0720, 0x0710, 0}; + static const shapeTest_char syriac_c[] = {{6, {0, 0}}, {5, {0, 0}}, {4, {0, 0}}, + {4, {0, 0}}, {2, {0, 0}}, {1, {0, 0}}, {0, {0, 0}}, {0, {0, 0}}}; static const shapeTest_glyph syriac_g[] = { + {1,{{SCRIPT_JUSTIFY_ARABIC_NORMAL,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, - {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,1,1,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; @@ -1509,7 +1516,7 @@ static void test_ScriptShapeOpenType(HDC hdc) test_valid = find_font_for_range(hdc, "Estrangelo Edessa", 71, test_syriac[0], &hfont, &hfont_orig); if (hfont != NULL) { - test_shape_ok_valid(test_valid, hdc, test_syriac, 6, &Control, &State, 0, 6, syriac_c, syriac_g); + test_shape_ok_valid(test_valid, hdc, test_syriac, 8, &Control, &State, 0, 7, syriac_c, syriac_g); SelectObject(hdc, hfont_orig); DeleteObject(hfont); }

1 0

Józef Kucia : wined3d: Bind unordered access views even if they are not used by current shaders.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: a19e6265d7dcac0043a1be8b0c3c3ff2129b8061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19e6265d7dcac0043a1be8b0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 01:30:33 2017 +0100 wined3d: Bind unordered access views even if they are not used by current shaders. An alternative would be to invalidate unordered access view bindings when a shader is set. 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/context.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c7f5c66..ef11c5c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3410,9 +3410,6 @@ static void context_load_unordered_access_resources(struct wined3d_context *cont for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) { - if (!shader->reg_maps.uav_resource_info[i].type) - continue; - if (!(view = views[i])) continue; @@ -3447,12 +3444,10 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) { - if (!shader->reg_maps.uav_resource_info[i].type) - continue; - if (!(view = views[i])) { - WARN("No unordered access view bound at index %u.\n", i); + if (shader->reg_maps.uav_resource_info[i].type) + WARN("No unordered access view bound at index %u.\n", i); GL_EXTCALL(glBindImageTexture(i, 0, 0, GL_FALSE, 0, GL_READ_WRITE, GL_R8)); continue; }

1 0

Józef Kucia : d3d11/tests: Add test for UAV counters.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: 2a810c45f5c6e182b887b5d2a03dfc027642f6b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a810c45f5c6e182b887b5d2a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 01:30:34 2017 +0100 d3d11/tests: Add test for UAV counters. 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 | 200 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 200 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index cce46f2..9d9f6b6 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18,6 +18,7 @@ */ #include <assert.h> +#include <stdlib.h> #define COBJMACROS #include "initguid.h" #include "d3d11.h" @@ -14703,6 +14704,204 @@ done: release_test_context(&test_context); } +static unsigned int read_uav_counter(ID3D11DeviceContext *context, + ID3D11Buffer *staging_buffer, ID3D11UnorderedAccessView *uav) +{ + D3D11_MAPPED_SUBRESOURCE map_desc; + unsigned int counter; + + ID3D11DeviceContext_CopyStructureCount(context, staging_buffer, 0, uav); + + if (FAILED(ID3D11DeviceContext_Map(context, (ID3D11Resource *)staging_buffer, 0, + D3D11_MAP_READ, 0, &map_desc))) + return 0xdeadbeef; + counter = *(unsigned int *)map_desc.pData; + ID3D11DeviceContext_Unmap(context, (ID3D11Resource *)staging_buffer, 0); + return counter; +} + +static int compare_id(const void *a, const void *b) +{ + return *(int *)a - *(int *)b; +} + +static void test_uav_counters(void) +{ + ID3D11Buffer *buffer, *buffer2, *staging_buffer; + ID3D11ComputeShader *cs_producer, *cs_consumer; + D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; + struct d3d11_test_context test_context; + ID3D11UnorderedAccessView *uav, *uav2; + unsigned int data, id[128], i; + D3D11_BUFFER_DESC buffer_desc; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11Device *device; + D3D11_BOX box; + HRESULT hr; + + static const DWORD cs_producer_code[] = + { +#if 0 + RWStructuredBuffer<uint> u; + + [numthreads(4, 1, 1)] + void main(uint3 dispatch_id : SV_DispatchThreadID) + { + uint counter = u.IncrementCounter(); + u[counter] = dispatch_id.x; + } +#endif + 0x43425844, 0x013163a8, 0xe7d371b8, 0x4f71e39a, 0xd479e584, 0x00000001, 0x000000c8, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000074, 0x00050050, 0x0000001d, 0x0100086a, + 0x0480009e, 0x0011e000, 0x00000000, 0x00000004, 0x0200005f, 0x00020012, 0x02000068, 0x00000001, + 0x0400009b, 0x00000004, 0x00000001, 0x00000001, 0x050000b2, 0x00100012, 0x00000000, 0x0011e000, + 0x00000000, 0x080000a8, 0x0011e012, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000000, + 0x0002000a, 0x0100003e, + }; + static const DWORD cs_consumer_code[] = + { +#if 0 + RWStructuredBuffer<uint> u; + RWStructuredBuffer<uint> u2; + + [numthreads(4, 1, 1)] + void main() + { + uint counter = u.DecrementCounter(); + u2[counter] = u[counter]; + } +#endif + 0x43425844, 0x957ef3dd, 0x9f317559, 0x09c8f12d, 0xdbfd98c8, 0x00000001, 0x00000100, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000ac, 0x00050050, 0x0000002b, 0x0100086a, + 0x0480009e, 0x0011e000, 0x00000000, 0x00000004, 0x0400009e, 0x0011e000, 0x00000001, 0x00000004, + 0x02000068, 0x00000001, 0x0400009b, 0x00000004, 0x00000001, 0x00000001, 0x050000b3, 0x00100012, + 0x00000000, 0x0011e000, 0x00000000, 0x8b0000a7, 0x80002302, 0x00199983, 0x00100022, 0x00000000, + 0x0010000a, 0x00000000, 0x00004001, 0x00000000, 0x0011e006, 0x00000000, 0x090000a8, 0x0011e012, + 0x00000001, 0x0010000a, 0x00000000, 0x00004001, 0x00000000, 0x0010001a, 0x00000000, 0x0100003e, + }; + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; + + if (!init_test_context(&test_context, &feature_level)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreateComputeShader(device, cs_producer_code, sizeof(cs_producer_code), NULL, &cs_producer); + ok(SUCCEEDED(hr), "Failed to create compute shader, hr %#x.\n", hr); + hr = ID3D11Device_CreateComputeShader(device, cs_consumer_code, sizeof(cs_consumer_code), NULL, &cs_consumer); + ok(SUCCEEDED(hr), "Failed to create compute shader, hr %#x.\n", hr); + + memset(&buffer_desc, 0, sizeof(buffer_desc)); + buffer_desc.ByteWidth = sizeof(unsigned int); + buffer_desc.Usage = D3D11_USAGE_STAGING; + buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &staging_buffer); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x.\n", hr); + + buffer_desc.ByteWidth = 1024; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = D3D11_RESOURCE_MISC_BUFFER_STRUCTURED; + buffer_desc.StructureByteStride = sizeof(unsigned int); + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x.\n", hr); + uav_desc.Format = DXGI_FORMAT_UNKNOWN; + uav_desc.ViewDimension = D3D11_UAV_DIMENSION_BUFFER; + U(uav_desc).Buffer.FirstElement = 0; + U(uav_desc).Buffer.NumElements = buffer_desc.ByteWidth / sizeof(unsigned int); + U(uav_desc).Buffer.Flags = D3D11_BUFFER_UAV_FLAG_COUNTER; + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav); + ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &buffer2); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x.\n", hr); + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer2, NULL, &uav2); + ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + + data = read_uav_counter(context, staging_buffer, uav); + ok(!data, "Got unexpected initial value %u.\n", data); + data = 8; + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &uav, &data); + data = read_uav_counter(context, staging_buffer, uav); + todo_wine ok(data == 8, "Got unexpected value %u.\n", data); + + ID3D11DeviceContext_CSSetShader(context, cs_producer, NULL, 0); + data = 0; + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &uav, &data); + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 1, 1, &uav2, NULL); + data = read_uav_counter(context, staging_buffer, uav); + ok(!data, "Got unexpected value %u.\n", data); + + /* produce */ + ID3D11DeviceContext_Dispatch(context, 16, 1, 1); + data = read_uav_counter(context, staging_buffer, uav); + todo_wine ok(data == 64, "Got unexpected value %u.\n", data); + get_buffer_readback(buffer, &rb); + memcpy(id, rb.map_desc.pData, 64 * sizeof(*id)); + release_resource_readback(&rb); + qsort(id, 64, sizeof(*id), compare_id); + for (i = 0; i < 64; ++i) + { + if (id[i] != i) + break; + } + ok(i == 64, "Got unexpected id %u at %u.\n", id[i], i); + + /* consume */ + ID3D11DeviceContext_CSSetShader(context, cs_consumer, NULL, 0); + ID3D11DeviceContext_Dispatch(context, 16, 1, 1); + data = read_uav_counter(context, staging_buffer, uav); + ok(!data, "Got unexpected value %u.\n", data); + get_buffer_readback(buffer2, &rb); + memcpy(id, rb.map_desc.pData, 64 * sizeof(*id)); + release_resource_readback(&rb); + qsort(id, 64, sizeof(*id), compare_id); + for (i = 0; i < 64; ++i) + { + if (id[i] != i) + break; + } + ok(i == 64, "Got unexpected id %u at %u.\n", id[i], i); + + /* produce on CPU */ + for (i = 0; i < 8; ++i) + id[i] = 0xdeadbeef; + set_box(&box, 0, 0, 0, 8 * sizeof(*id), 1, 1); + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)buffer, 0, &box, id, 0, 0); + data = 8; + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &uav, &data); + data = read_uav_counter(context, staging_buffer, uav); + todo_wine ok(data == 8, "Got unexpected value %u.\n", data); + + /* consume */ + ID3D11DeviceContext_Dispatch(context, 1, 1, 1); + data = read_uav_counter(context, staging_buffer, uav); + todo_wine ok(data == 4, "Got unexpected value %u.\n", data); + ID3D11DeviceContext_Dispatch(context, 1, 1, 1); + data = read_uav_counter(context, staging_buffer, uav); + ok(!data, "Got unexpected value %u.\n", data); + get_buffer_readback(buffer2, &rb); + for (i = 0; i < 8; ++i) + { + data = get_readback_color(&rb, i, 0); + todo_wine ok(data == 0xdeadbeef, "Got data %u at %u.\n", data, i); + } + release_resource_readback(&rb); + + ID3D11Buffer_Release(buffer); + ID3D11Buffer_Release(buffer2); + ID3D11Buffer_Release(staging_buffer); + ID3D11ComputeShader_Release(cs_producer); + ID3D11ComputeShader_Release(cs_consumer); + ID3D11UnorderedAccessView_Release(uav); + ID3D11UnorderedAccessView_Release(uav2); + release_test_context(&test_context); +} + static void test_compute_shader_registers(void) { struct data @@ -15213,6 +15412,7 @@ START_TEST(d3d11) test_buffer_srv(); run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_10_0, D3D_FEATURE_LEVEL_11_0, test_unaligned_raw_buffer_access); + test_uav_counters(); test_compute_shader_registers(); test_tgsm(); }

1 0

Józef Kucia : d3d11/tests: Use 256-byte aligned offsets for bufinfo test.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: 8c269e468ace29d009ec9c08b6de43e2e84aa0ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c269e468ace29d009ec9c08b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 01:30:35 2017 +0100 d3d11/tests: Use 256-byte aligned offsets for bufinfo test. 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 | 64 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 18 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9d9f6b6..9f317de 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -13824,6 +13824,34 @@ static void test_sm5_bufinfo_instruction(void) 0x00000000, 0x00004002, 0x00000000, 0x00000014, 0x00000000, 0x00000001, 0x0100003e, }; static const struct shader ps_uav_structured = {ps_uav_structured_code, sizeof(ps_uav_structured_code)}; + static const DWORD ps_uav_structured32_code[] = + { +#if 0 + struct s + { + uint4 u; + bool4 b; + }; + + RWStructuredBuffer<s> b; + + uint4 main(void) : SV_Target + { + uint count, stride; + b.GetDimensions(count, stride); + return uint4(count, stride, 0, 1); + } +#endif + 0x43425844, 0xdd87a805, 0x28090470, 0xe4fa7c4d, 0x57963f52, 0x00000001, 0x000000fc, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000084, 0x00000050, 0x00000021, + 0x0100086a, 0x0400009e, 0x0011e000, 0x00000001, 0x00000020, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x87000079, 0x80010302, 0x00199983, 0x00100012, 0x00000000, 0x0011ee46, + 0x00000001, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x08000036, 0x001020e2, + 0x00000000, 0x00004002, 0x00000000, 0x00000020, 0x00000000, 0x00000001, 0x0100003e, + }; + static const struct shader ps_uav_structured32 = {ps_uav_structured32_code, sizeof(ps_uav_structured32_code)}; static const DWORD ps_srv_structured_code[] = { #if 0 @@ -13946,24 +13974,24 @@ static void test_sm5_bufinfo_instruction(void) { #define RAW D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS #define STRUCTURED D3D11_RESOURCE_MISC_BUFFER_STRUCTURED - {&ps_uav_raw, TRUE, 100, RAW, 0, DXGI_FORMAT_R32_TYPELESS, 0, 25, {100, 100, 100, 100}}, - {&ps_uav_raw, TRUE, 100, RAW, 0, DXGI_FORMAT_R32_TYPELESS, 8, 17, { 68, 68, 68, 68}}, - {&ps_srv_raw, FALSE, 100, RAW, 0, DXGI_FORMAT_R32_TYPELESS, 0, 25, {100, 100, 100, 100}}, - {&ps_srv_raw, FALSE, 100, RAW, 0, DXGI_FORMAT_R32_TYPELESS, 8, 17, { 68, 68, 68, 68}}, - {&ps_uav_structured, TRUE, 100, STRUCTURED, 20, DXGI_FORMAT_UNKNOWN, 0, 5, { 5, 20, 0, 1}}, - {&ps_uav_structured, TRUE, 100, STRUCTURED, 20, DXGI_FORMAT_UNKNOWN, 0, 2, { 2, 20, 0, 1}}, - {&ps_uav_structured, TRUE, 100, STRUCTURED, 20, DXGI_FORMAT_UNKNOWN, 1, 2, { 2, 20, 0, 1}}, - {&ps_srv_structured, FALSE, 100, STRUCTURED, 4, DXGI_FORMAT_UNKNOWN, 0, 5, { 5, 4, 0, 1}}, - {&ps_srv_structured, FALSE, 100, STRUCTURED, 4, DXGI_FORMAT_UNKNOWN, 0, 2, { 2, 4, 0, 1}}, - {&ps_srv_structured, FALSE, 100, STRUCTURED, 4, DXGI_FORMAT_UNKNOWN, 1, 2, { 2, 4, 0, 1}}, - {&ps_uav_typed, TRUE, 200, 0, 0, DXGI_FORMAT_R32_FLOAT, 0, 50, { 50, 50, 50, 50}}, - {&ps_uav_typed, TRUE, 200, 0, 0, DXGI_FORMAT_R32_FLOAT, 49, 1, { 1, 1, 1, 1}}, - {&ps_uav_typed, TRUE, 100, 0, 0, DXGI_FORMAT_R16_FLOAT, 0, 50, { 50, 50, 50, 50}}, - {&ps_uav_typed, TRUE, 100, 0, 0, DXGI_FORMAT_R16_FLOAT, 49, 1, { 1, 1, 1, 1}}, - {&ps_srv_typed, FALSE, 200, 0, 0, DXGI_FORMAT_R32_FLOAT, 0, 50, { 50, 50, 50, 50}}, - {&ps_srv_typed, FALSE, 200, 0, 0, DXGI_FORMAT_R32_FLOAT, 49, 1, { 1, 1, 1, 1}}, - {&ps_srv_typed, FALSE, 100, 0, 0, DXGI_FORMAT_R16_FLOAT, 0, 50, { 50, 50, 50, 50}}, - {&ps_srv_typed, FALSE, 100, 0, 0, DXGI_FORMAT_R16_FLOAT, 49, 1, { 1, 1, 1, 1}}, + {&ps_uav_raw, TRUE, 100, RAW, 0, DXGI_FORMAT_R32_TYPELESS, 0, 25, {100, 100, 100, 100}}, + {&ps_uav_raw, TRUE, 512, RAW, 0, DXGI_FORMAT_R32_TYPELESS, 64, 64, {256, 256, 256, 256}}, + {&ps_srv_raw, FALSE, 100, RAW, 0, DXGI_FORMAT_R32_TYPELESS, 0, 25, {100, 100, 100, 100}}, + {&ps_srv_raw, FALSE, 500, RAW, 0, DXGI_FORMAT_R32_TYPELESS, 64, 4, { 16, 16, 16, 16}}, + {&ps_uav_structured, TRUE, 100, STRUCTURED, 20, DXGI_FORMAT_UNKNOWN, 0, 5, { 5, 20, 0, 1}}, + {&ps_uav_structured, TRUE, 100, STRUCTURED, 20, DXGI_FORMAT_UNKNOWN, 0, 2, { 2, 20, 0, 1}}, + {&ps_uav_structured32, TRUE, 320, STRUCTURED, 32, DXGI_FORMAT_UNKNOWN, 8, 2, { 2, 32, 0, 1}}, + {&ps_srv_structured, FALSE, 100, STRUCTURED, 4, DXGI_FORMAT_UNKNOWN, 0, 5, { 5, 4, 0, 1}}, + {&ps_srv_structured, FALSE, 100, STRUCTURED, 4, DXGI_FORMAT_UNKNOWN, 0, 2, { 2, 4, 0, 1}}, + {&ps_srv_structured, FALSE, 400, STRUCTURED, 4, DXGI_FORMAT_UNKNOWN, 64, 2, { 2, 4, 0, 1}}, + {&ps_uav_typed, TRUE, 200, 0, 0, DXGI_FORMAT_R32_FLOAT, 0, 50, { 50, 50, 50, 50}}, + {&ps_uav_typed, TRUE, 400, 0, 0, DXGI_FORMAT_R32_FLOAT, 64, 1, { 1, 1, 1, 1}}, + {&ps_uav_typed, TRUE, 100, 0, 0, DXGI_FORMAT_R16_FLOAT, 0, 50, { 50, 50, 50, 50}}, + {&ps_uav_typed, TRUE, 400, 0, 0, DXGI_FORMAT_R16_FLOAT, 128, 1, { 1, 1, 1, 1}}, + {&ps_srv_typed, FALSE, 200, 0, 0, DXGI_FORMAT_R32_FLOAT, 0, 50, { 50, 50, 50, 50}}, + {&ps_srv_typed, FALSE, 400, 0, 0, DXGI_FORMAT_R32_FLOAT, 64, 1, { 1, 1, 1, 1}}, + {&ps_srv_typed, FALSE, 100, 0, 0, DXGI_FORMAT_R16_FLOAT, 0, 50, { 50, 50, 50, 50}}, + {&ps_srv_typed, FALSE, 400, 0, 0, DXGI_FORMAT_R16_FLOAT, 128, 2, { 2, 2, 2, 2}}, #undef RAW #undef STRUCTURED };

1 0

Józef Kucia : wined3d: Implement SM5 bufinfo instruction.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: 097e8355c6081c745bf12c26fd419a48a9a4d3d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=097e8355c6081c745bf12c26f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 01:30:36 2017 +0100 wined3d: Implement SM5 bufinfo instruction. 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 | 2 +- dlls/wined3d/glsl_shader.c | 66 +++++++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/shader.c | 8 ++++++ 3 files changed, 74 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9f317de..2d9d07a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -14079,7 +14079,7 @@ static void test_sm5_bufinfo_instruction(void) } draw_quad(&test_context); - todo_wine check_texture_uvec4(texture, &test->expected_result); + check_texture_uvec4(texture, &test->expected_result); if (srv) ID3D11ShaderResourceView_Release(srv); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8e54a68..d021f01 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5389,6 +5389,70 @@ static void shader_glsl_sync(const struct wined3d_shader_instruction *ins) FIXME("Unhandled sync flags %#x.\n", sync_flags); } +static const struct wined3d_shader_resource_info *shader_glsl_get_resource_info( + const struct wined3d_shader_instruction *ins, const struct wined3d_shader_register *reg) +{ + const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + unsigned int idx = reg->idx[0].offset; + + if (reg->type == WINED3DSPR_RESOURCE) + { + if (idx >= ARRAY_SIZE(reg_maps->resource_info)) + { + ERR("Invalid resource index %u.\n", idx); + return NULL; + } + return &reg_maps->resource_info[idx]; + } + + if (reg->type == WINED3DSPR_UAV) + { + if (idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + { + ERR("Invalid UAV index %u.\n", idx); + return NULL; + } + return &reg_maps->uav_resource_info[idx]; + } + + FIXME("Unhandled register type %#x.\n", reg->type); + return NULL; +} + +static void shader_glsl_bufinfo(const struct wined3d_shader_instruction *ins) +{ + const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type); + const struct wined3d_shader_resource_info *resource_info; + struct wined3d_string_buffer *buffer = ins->ctx->buffer; + unsigned int resource_idx; + char dst_swizzle[6]; + DWORD write_mask; + + write_mask = shader_glsl_append_dst(buffer, ins); + shader_glsl_get_swizzle(&ins->src[0], FALSE, write_mask, dst_swizzle); + + if (!(resource_info = shader_glsl_get_resource_info(ins, &ins->src[0].reg))) + return; + resource_idx = ins->src[0].reg.idx[0].offset; + + shader_addline(buffer, "ivec2("); + if (ins->src[0].reg.type == WINED3DSPR_RESOURCE) + { + unsigned int bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, + resource_idx, WINED3D_SAMPLER_DEFAULT); + shader_addline(buffer, "textureSize(%s_sampler%u)", prefix, bind_idx); + } + else + { + shader_addline(buffer, "imageSize(%s_image%u)", prefix, resource_idx); + } + if (resource_info->stride) + shader_addline(buffer, " / %u", resource_info->stride); + else if (resource_info->flags & WINED3D_VIEW_BUFFER_RAW) + shader_addline(buffer, " * 4"); + shader_addline(buffer, ", %u)%s);\n", resource_info->stride, dst_swizzle); +} + static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; @@ -9555,7 +9619,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_BUFINFO */ shader_glsl_bufinfo, /* 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 b07131d..f867766 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1382,6 +1382,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } else if ((WINED3DSIH_ATOMIC_AND <= ins.handler_idx && ins.handler_idx <= WINED3DSIH_ATOMIC_XOR) || (WINED3DSIH_IMM_ATOMIC_AND <= ins.handler_idx && ins.handler_idx <= WINED3DSIH_IMM_ATOMIC_XOR) + || (ins.handler_idx == WINED3DSIH_BUFINFO && ins.src[0].reg.type == WINED3DSPR_UAV) || ins.handler_idx == WINED3DSIH_LD_UAV_TYPED || (ins.handler_idx == WINED3DSIH_LD_RAW && ins.src[1].reg.type == WINED3DSPR_UAV) || (ins.handler_idx == WINED3DSIH_LD_STRUCTURED && ins.src[2].reg.type == WINED3DSPR_UAV)) @@ -1393,6 +1394,8 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st reg_idx = ins.src[2].reg.idx[0].offset; else if (WINED3DSIH_ATOMIC_AND <= ins.handler_idx && ins.handler_idx <= WINED3DSIH_ATOMIC_XOR) reg_idx = ins.dst[0].reg.idx[0].offset; + else if (ins.handler_idx == WINED3DSIH_BUFINFO) + reg_idx = ins.src[0].reg.idx[0].offset; else reg_idx = ins.dst[1].reg.idx[0].offset; if (reg_idx >= MAX_UNORDERED_ACCESS_VIEWS) @@ -1446,6 +1449,11 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st shader_record_sample(reg_maps, ins.src[1].reg.idx[0].offset, ins.src[2].reg.idx[0].offset, reg_maps->sampler_map.count); } + else if (ins.handler_idx == WINED3DSIH_BUFINFO && ins.src[0].reg.type == WINED3DSPR_RESOURCE) + { + shader_record_sample(reg_maps, ins.src[0].reg.idx[0].offset, + WINED3D_SAMPLER_DEFAULT, reg_maps->sampler_map.count); + } else if (ins.handler_idx == WINED3DSIH_LD || (ins.handler_idx == WINED3DSIH_LD_RAW && ins.src[1].reg.type == WINED3DSPR_RESOURCE) || (ins.handler_idx == WINED3DSIH_RESINFO && ins.src[1].reg.type == WINED3DSPR_RESOURCE))

1 0