October 2020 - Wine-Commits

Anton Baskanov : amstream: Implement IDirectDrawStreamSample::CompletionStatus.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: 29a4921278b2675f47c60a4a90788a2ea90d7e3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=29a4921278b2675f47c60a4a… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Oct 2 00:57:19 2020 +0700 amstream: Implement IDirectDrawStreamSample::CompletionStatus. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 53 ++++++-- dlls/amstream/tests/amstream.c | 292 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 335 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=29a4921278b2675f47c6…

1 0

Michael Stefaniuc : httpapi: Use wide-char string literals.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: 21a4bd7b4890269852357793db9d245333ecba2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=21a4bd7b4890269852357793… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:26 2020 +0200 httpapi: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi_main.c | 9 +++------ dlls/httpapi/tests/httpapi.c | 31 ++++++++++++------------------- 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 6be4d11d35..52fa6cc1d8 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -27,8 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(http); -static const WCHAR device_nameW[] = {'\\','D','e','v','i','c','e','\\','H','t','t','p','\\','R','e','q','Q','u','e','u','e',0}; - static WCHAR *heap_strdupW(const WCHAR *str) { int len = wcslen(str) + 1; @@ -53,7 +51,6 @@ static WCHAR *heap_strdupW(const WCHAR *str) */ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved) { - static const WCHAR httpW[] = {'h','t','t','p',0}; SC_HANDLE manager, service; TRACE("version %u.%u, flags %#x, reserved %p.\n", version.HttpApiMajorVersion, @@ -68,7 +65,7 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved if (!(manager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT))) return GetLastError(); - if (!(service = OpenServiceW(manager, httpW, SERVICE_START))) + if (!(service = OpenServiceW(manager, L"http", SERVICE_START))) { ERR("Failed to open HTTP service, error %u.\n", GetLastError()); CloseServiceHandle(manager); @@ -205,7 +202,7 @@ ULONG WINAPI HttpCreateHttpHandle(HANDLE *handle, ULONG reserved) if (!handle) return ERROR_INVALID_PARAMETER; - RtlInitUnicodeString(&string, device_nameW); + RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); attr.ObjectName = &string; return RtlNtStatusToDosError(NtCreateFile(handle, 0, &attr, &iosb, NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL, 0)); @@ -752,7 +749,7 @@ ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION version, const WCHAR *name, if (flags) FIXME("Unhandled flags %#x.\n", flags); - RtlInitUnicodeString(&string, device_nameW); + RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); attr.ObjectName = &string; if (sa && sa->bInheritHandle) attr.Attributes |= OBJ_INHERIT; diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index b6bfbbccf0..c54158d45a 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -33,13 +33,6 @@ #include "wine/test.h" -static const WCHAR invalid_url1[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t',':','5','0','0','0','0',0}; -static const WCHAR invalid_url2[] = {'l','o','c','a','l','h','o','s','t',':','5','0','0','0','0',0}; -static const WCHAR invalid_url3[] = {'l','o','c','a','l','h','o','s','t',':','5','0','0','0','0','/',0}; -static const WCHAR invalid_url4[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t','/',0}; -static const WCHAR invalid_url5[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t',':','/',0}; -static const WCHAR invalid_url6[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t',':','0','/',0}; - static ULONG (WINAPI *pHttpAddUrlToUrlGroup)(HTTP_URL_GROUP_ID id, const WCHAR *url, HTTP_URL_CONTEXT context, ULONG reserved); static ULONG (WINAPI *pHttpCreateServerSession)(HTTPAPI_VERSION version, HTTP_SERVER_SESSION_ID *session_id, ULONG reserved); static ULONG (WINAPI *pHttpCreateRequestQueue)(HTTPAPI_VERSION version, const WCHAR *name, SECURITY_ATTRIBUTES *sa, ULONG flags, HANDLE *handle); @@ -205,17 +198,17 @@ static void test_v1_server(void) ret = HttpAddUrl(NULL, L"http://localhost:50000/", NULL); ok(ret == ERROR_INVALID_HANDLE || ret == ERROR_INVALID_PARAMETER /* < Vista */, "Got error %u.\n", ret); - ret = HttpAddUrl(queue, invalid_url1, NULL); + ret = HttpAddUrl(queue, L"http://localhost:50000", NULL); ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = HttpAddUrl(queue, invalid_url2, NULL); + ret = HttpAddUrl(queue, L"localhost:50000", NULL); ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = HttpAddUrl(queue, invalid_url3, NULL); + ret = HttpAddUrl(queue, L"localhost:50000/", NULL); ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = HttpAddUrl(queue, invalid_url4, NULL); + ret = HttpAddUrl(queue, L"http://localhost/", NULL); ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = HttpAddUrl(queue, invalid_url5, NULL); + ret = HttpAddUrl(queue, L"http://localhost:/", NULL); ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = HttpAddUrl(queue, invalid_url6, NULL); + ret = HttpAddUrl(queue, L"http://localhost:0/", NULL); ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); port = add_url_v1(queue); swprintf(url, ARRAY_SIZE(url), L"http://localhost:%u/", port); @@ -1273,17 +1266,17 @@ static void test_v2_server(void) port = add_url_v2(group); - ret = pHttpAddUrlToUrlGroup(group, invalid_url1, 0xdeadbeef, 0); + ret = pHttpAddUrlToUrlGroup(group, L"http://localhost:50000", 0xdeadbeef, 0); todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = pHttpAddUrlToUrlGroup(group, invalid_url2, 0xdeadbeef, 0); + ret = pHttpAddUrlToUrlGroup(group, L"localhost:50000", 0xdeadbeef, 0); todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = pHttpAddUrlToUrlGroup(group, invalid_url3, 0xdeadbeef, 0); + ret = pHttpAddUrlToUrlGroup(group, L"localhost:50000/", 0xdeadbeef, 0); todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = pHttpAddUrlToUrlGroup(group, invalid_url4, 0xdeadbeef, 0); + ret = pHttpAddUrlToUrlGroup(group, L"http://localhost/", 0xdeadbeef, 0); todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = pHttpAddUrlToUrlGroup(group, invalid_url5, 0xdeadbeef, 0); + ret = pHttpAddUrlToUrlGroup(group, L"http://localhost:/", 0xdeadbeef, 0); todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = pHttpAddUrlToUrlGroup(group, invalid_url6, 0xdeadbeef, 0); + ret = pHttpAddUrlToUrlGroup(group, L"http://localhost:0/", 0xdeadbeef, 0); todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); swprintf(url, ARRAY_SIZE(url), L"http://localhost:%u/", port); ret = pHttpAddUrlToUrlGroup(group, url, 0xdeadbeef, 0);

1 0

Michael Stefaniuc : fntcache: Use wide-char string literals.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: 403b51279677788effc8fc7d6b8697fcaa300901 URL: https://source.winehq.org/git/wine.git/?a=commit;h=403b51279677788effc8fc7d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:25 2020 +0200 fntcache: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fntcache/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/fntcache/main.c b/dlls/fntcache/main.c index 8de84b262e..f579c4ebf3 100644 --- a/dlls/fntcache/main.c +++ b/dlls/fntcache/main.c @@ -83,14 +83,13 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, void *event_d */ VOID WINAPI ServiceMain(DWORD argc, LPWSTR *argv) { - static const WCHAR fontcacheW[] = {'F','o','n','t','C','a','c','h','e',0}; SERVICE_STATUS status; TRACE( "starting service\n" ); stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); - service_handle = RegisterServiceCtrlHandlerExW( fontcacheW, service_handler, NULL ); + service_handle = RegisterServiceCtrlHandlerExW( L"FontCache", service_handler, NULL ); if (!service_handle) return;

1 0

Michael Stefaniuc : fltmgr.sys: Use wide-char string literals.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: b231650925eeaf29062791919332f942b61a050b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b231650925eeaf2906279191… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:24 2020 +0200 fltmgr.sys: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fltmgr.sys/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index a1b81e5a89..e1016a4989 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -82,8 +82,7 @@ void WINAPI FltUnregisterFilter( PFLT_FILTER filter ) void* WINAPI FltGetRoutineAddress(LPCSTR name) { - static const WCHAR fltmgrW[] = {'f','l','t','m','g','r','.','s','y','s',0}; - HMODULE mod = GetModuleHandleW(fltmgrW); + HMODULE mod = GetModuleHandleW(L"fltmgr.sys"); void *func; func = GetProcAddress(mod, name);

1 0

Anton Baskanov : amstream: Implement IDirectDrawStreamSample::GetSampleTimes.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: e58b42d48d2d5e91b623abeb7c02187864321d23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e58b42d48d2d5e91b623abeb… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Oct 2 00:57:20 2020 +0700 amstream: Implement IDirectDrawStreamSample::GetSampleTimes. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 28 ++++++-- dlls/amstream/tests/amstream.c | 155 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 177 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e58b42d48d2d5e91b623…

1 0

Michael Stefaniuc : msftedit: Use wide-char string literals.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: 6d3d0884c0999da296d6a18b9033fb92ee087c99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d3d0884c0999da296d6a18b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:33 2020 +0200 msftedit: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msftedit/msftedit_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msftedit/msftedit_main.c b/dlls/msftedit/msftedit_main.c index c578efafda..fbad7182a5 100644 --- a/dlls/msftedit/msftedit_main.c +++ b/dlls/msftedit/msftedit_main.c @@ -42,7 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msftedit); */ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) { - static const WCHAR riched20W[] = {'r','i','c','h','e','d','2','0','.','d','l','l',0}; static HMODULE richedit; switch(reason) @@ -51,7 +50,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: /* explicitly load riched20 since it creates the window classes at dll attach time */ - richedit = LoadLibraryW( riched20W ); + richedit = LoadLibraryW( L"riched20.dll" ); DisableThreadLibraryCalls(inst); break; case DLL_PROCESS_DETACH:

1 0

Michael Stefaniuc : msadp32.acm: Use wide-char string literals.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: 93a55831b2b677c3b10365de613f4693f7813d62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93a55831b2b677c3b10365de… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:32 2020 +0200 msadp32.acm: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msadp32.acm/msadp32.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 78d99a21de..8b83f69c00 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -404,9 +404,6 @@ static LRESULT ADPCM_DriverDetails(PACMDRIVERDETAILSW add) */ static LRESULT ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) { - static const WCHAR szPcm[]={'P','C','M',0}; - static const WCHAR szMsAdPcm[]={'M','i','c','r','o','s','o','f','t',' ','A','D','P','C','M',0}; - switch (dwQuery) { case ACM_FORMATTAGDETAILSF_INDEX: @@ -439,13 +436,13 @@ static LRESULT ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats); - lstrcpyW(aftd->szFormatTag, szPcm); + lstrcpyW(aftd->szFormatTag, L"PCM"); break; case 1: aftd->dwFormatTag = WAVE_FORMAT_ADPCM; aftd->cbFormatSize = sizeof(ADPCMWAVEFORMAT) + (7 - 1) * sizeof(ADPCMCOEFSET); aftd->cStandardFormats = ARRAY_SIZE(ADPCM_Formats); - lstrcpyW(aftd->szFormatTag, szMsAdPcm); + lstrcpyW(aftd->szFormatTag, L"Microsoft ADPCM"); break; } return MMSYSERR_NOERROR;

1 0

Zebediah Figura : tests: Import HLSL majority tests from Wine.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: vkd3d Branch: master Commit: ec6fe1cc9dd31ed17d5c9818632ce9ab83d6c441 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ec6fe1cc9dd31ed17d5c981… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 1 23:09:48 2020 -0500 tests: Import HLSL majority tests from Wine. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 4 ++++ tests/hlsl-majority-pragma.shader_test | 21 +++++++++++++++++++++ tests/hlsl-majority-typedef.shader_test | 22 ++++++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/Makefile.am b/Makefile.am index 7911a8e..415e686 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,6 +53,8 @@ vkd3d_shader_tests = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-majority-pragma.shader_test \ + tests/hlsl-majority-typedef.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-vector-indexing.shader_test \ @@ -189,6 +191,8 @@ XFAIL_TESTS = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-majority-pragma.shader_test \ + tests/hlsl-majority-typedef.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-vector-indexing.shader_test \ diff --git a/tests/hlsl-majority-pragma.shader_test b/tests/hlsl-majority-pragma.shader_test new file mode 100644 index 0000000..e7fc75c --- /dev/null +++ b/tests/hlsl-majority-pragma.shader_test @@ -0,0 +1,21 @@ +[pixel shader] +#pragma pack_matrix(row_major) +uniform float2x2 r; +#pragma pack_matrix(column_major) +uniform float2x2 c; + +float4 main() : sv_target +{ + float4 ret; + ret.xy = mul(r, float2(0.5, 0.6)); + ret.zw = mul(c, float2(0.5, 0.6)); + return ret; +} + +[test] +uniform 0 float4 0.1 0.2 0.0 0.0 +uniform 4 float4 0.3 0.4 0.0 0.0 +uniform 8 float4 0.1 0.3 0.0 0.0 +uniform 12 float4 0.2 0.4 0.0 0.0 +draw quad +probe all rgba (0.17, 0.39, 0.17, 0.39) 1 diff --git a/tests/hlsl-majority-typedef.shader_test b/tests/hlsl-majority-typedef.shader_test new file mode 100644 index 0000000..1460e9a --- /dev/null +++ b/tests/hlsl-majority-typedef.shader_test @@ -0,0 +1,22 @@ +[pixel shader] +typedef float2x2 matrix_t; +typedef row_major matrix_t row_matrix_t; +typedef column_major matrix_t col_matrix_t; +uniform row_matrix_t r; +uniform col_matrix_t c; + +float4 main() : sv_target +{ + float4 ret; + ret.xy = mul(r, float2(0.5, 0.6)); + ret.zw = mul(c, float2(0.5, 0.6)); + return ret; +} + +[test] +uniform 0 float4 0.1 0.2 0.0 0.0 +uniform 4 float4 0.3 0.4 0.0 0.0 +uniform 8 float4 0.1 0.3 0.0 0.0 +uniform 12 float4 0.2 0.4 0.0 0.0 +draw quad +probe all rgba (0.17, 0.39, 0.17, 0.39) 1

1 0

Zebediah Figura : tests: Import comma tests from Wine.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: vkd3d Branch: master Commit: fe6b9678d807e641c878edd7449553c2a03cf0d2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fe6b9678d807e641c878edd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 1 23:09:45 2020 -0500 tests: Import comma tests from Wine. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ tests/hlsl-comma.shader_test | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/Makefile.am b/Makefile.am index 2e286bc..c6d9b06 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,6 +51,7 @@ vkd3d_shader_runners = \ vkd3d_shader_tests = \ tests/conditional.shader_test \ + tests/hlsl-comma.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ @@ -183,6 +184,7 @@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ tests/conditional.shader_test \ + tests/hlsl-comma.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ diff --git a/tests/hlsl-comma.shader_test b/tests/hlsl-comma.shader_test new file mode 100644 index 0000000..23bee71 --- /dev/null +++ b/tests/hlsl-comma.shader_test @@ -0,0 +1,10 @@ +[pixel shader] +float4 main(): sv_target +{ + float4 ret; + return (ret = float4(0.1, 0.2, 0.3, 0.4)), ret + 0.5; +} + +[test] +draw quad +probe all rgba (0.6, 0.7, 0.8, 0.9)

1 0

Zebediah Figura : tests: Import trigonometry tests from Wine.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: vkd3d Branch: master Commit: c3ac07efa75a03bc45fa930189d27b7beb4d7d7d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c3ac07efa75a03bc45fa930… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 1 23:09:44 2020 -0500 tests: Import trigonometry tests from Wine. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 6 ++++-- tests/shader_runner_d3d12.c | 23 +++++++++++++++++++++++ tests/trigonometry.shader_test | 24 ++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 27bc00b..2e286bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -61,7 +61,8 @@ vkd3d_shader_tests = \ tests/swizzle-4.shader_test \ tests/swizzle-5.shader_test \ tests/swizzle-6.shader_test \ - tests/swizzle-7.shader_test + tests/swizzle-7.shader_test \ + tests/trigonometry.shader_test vkd3d_test_headers = \ tests/d3d12_crosstest.h \ @@ -192,7 +193,8 @@ XFAIL_TESTS = \ tests/swizzle-4.shader_test \ tests/swizzle-5.shader_test \ tests/swizzle-6.shader_test \ - tests/swizzle-7.shader_test + tests/swizzle-7.shader_test \ + tests/trigonometry.shader_test endif if BUILD_DEMOS diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 709fc00..0e9694a 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -190,6 +190,29 @@ static void parse_test_directive(struct shader_context *context, const char *lin release_resource_readback(&rb); reset_command_list(context->c.list, context->c.allocator); } + else if (match_string(line, "probe rgba", &line)) + { + struct resource_readback rb; + unsigned int x, y, ulps; + struct vec4 v; + RECT rect; + int ret; + + ret = sscanf(line, "( %u , %u ) ( %f , %f , %f , %f ) %u", &x, &y, &v.x, &v.y, &v.z, &v.w, &ulps); + if (ret < 6) + goto err; + if (ret < 7) + ulps = 0; + + get_texture_readback_with_command_list(context->c.render_target, 0, &rb, context->c.queue, context->c.list); + rect.left = x; + rect.right = x + 1; + rect.top = y; + rect.bottom = y + 1; + check_readback_data_vec4(&rb, &rect, &v, ulps); + release_resource_readback(&rb); + reset_command_list(context->c.list, context->c.allocator); + } else if (match_string(line, "uniform", &line)) { unsigned int offset; diff --git a/tests/trigonometry.shader_test b/tests/trigonometry.shader_test new file mode 100644 index 0000000..07a280a --- /dev/null +++ b/tests/trigonometry.shader_test @@ -0,0 +1,24 @@ +[pixel shader] +float4 main(float4 pos : SV_POSITION) : SV_TARGET +{ + return float4(sin(pos.x - 0.5), cos(pos.x - 0.5), 0, 0); +} + +[test] +draw quad +probe rgba ( 0, 0) ( 0.00000000, 1.00000000, 0.0, 0.0) +probe rgba ( 1, 0) ( 0.84147098, 0.54030231, 0.0, 0.0) 1024 +probe rgba ( 2, 0) ( 0.90929743, -0.41614684, 0.0, 0.0) 1024 +probe rgba ( 3, 0) ( 0.14112001, -0.98999250, 0.0, 0.0) 1024 +probe rgba ( 4, 0) (-0.75680250, -0.65364362, 0.0, 0.0) 1024 +probe rgba ( 5, 0) (-0.95892427, 0.28366219, 0.0, 0.0) 1024 +probe rgba ( 6, 0) (-0.27941550, 0.96017029, 0.0, 0.0) 1024 +probe rgba ( 7, 0) ( 0.65698660, 0.75390225, 0.0, 0.0) 1024 +probe rgba ( 8, 0) ( 0.98935825, -0.14550003, 0.0, 0.0) 1024 +probe rgba ( 9, 0) ( 0.41211849, -0.91113026, 0.0, 0.0) 1024 +probe rgba (10, 0) (-0.54402111, -0.83907153, 0.0, 0.0) 1024 +probe rgba (11, 0) (-0.99999021, 0.00442570, 0.0, 0.0) 1024 +probe rgba (12, 0) (-0.53657292, 0.84385396, 0.0, 0.0) 1024 +probe rgba (13, 0) ( 0.42016704, 0.90744678, 0.0, 0.0) 1024 +probe rgba (14, 0) ( 0.99060736, 0.13673722, 0.0, 0.0) 1024 +probe rgba (15, 0) ( 0.65028784, -0.75968791, 0.0, 0.0) 1024

1 0