wine-commits October 2020

wine-commits@winehq.org

1 participants
796 discussions

Michael Stefaniuc : imaadp32.acm: Use wide-char string literals.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: aacc33ba9ed839d5cb3e993cc59dc8a39a62edfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=aacc33ba9ed839d5cb3e993c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:28 2020 +0200 imaadp32.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/imaadp32.acm/imaadp32.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index a93b5f6af7..b6d70dcbe2 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -548,9 +548,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 szImaAdPcm[]={'I','M','A',' ','A','D','P','C','M',0}; - switch (dwQuery) { case ACM_FORMATTAGDETAILSF_INDEX: @@ -583,13 +580,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_IMA_ADPCM; aftd->cbFormatSize = sizeof(IMAADPCMWAVEFORMAT); aftd->cStandardFormats = ARRAY_SIZE(ADPCM_Formats); - lstrcpyW(aftd->szFormatTag, szImaAdPcm); + lstrcpyW(aftd->szFormatTag, L"IMA ADPCM"); break; } return MMSYSERR_NOERROR;

1 0

Michael Stefaniuc : http.sys: Use wide-char string literals.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: wine Branch: master Commit: cef48706eb3c5039e7fdcd1a7a48495ebc3608a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cef48706eb3c5039e7fdcd1a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:27 2020 +0200 http.sys: 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/http.sys/http.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 31c7fc0971..e655edfeea 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -977,8 +977,6 @@ static void WINAPI unload(DRIVER_OBJECT *driver) NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) { - 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 const WCHAR directory_nameW[] = {'\\','D','e','v','i','c','e','\\','H','t','t','p',0}; OBJECT_ATTRIBUTES attr = {sizeof(attr)}; UNICODE_STRING string; WSADATA wsadata; @@ -986,12 +984,12 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) TRACE("driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); - RtlInitUnicodeString(&string, directory_nameW); + RtlInitUnicodeString(&string, L"\\Device\\Http"); attr.ObjectName = &string; if ((ret = NtCreateDirectoryObject(&directory_obj, 0, &attr)) && ret != STATUS_OBJECT_NAME_COLLISION) ERR("Failed to create \\Device\\Http directory, status %#x.\n", ret); - RtlInitUnicodeString(&string, device_nameW); + RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); if ((ret = IoCreateDevice(driver, 0, &string, FILE_DEVICE_UNKNOWN, 0, FALSE, &device_obj))) { ERR("Failed to create request queue device, status %#x.\n", ret);

1 0

Michael Stefaniuc : httpapi: Use wide-char string literals.
by Alexandre Julliard 02 Oct '20

02 Oct '20

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 02 Oct '20

02 Oct '20

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 02 Oct '20

02 Oct '20

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 02 Oct '20

02 Oct '20

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

Anton Baskanov : amstream: Implement IDirectDrawStreamSample::CompletionStatus.
by Alexandre Julliard 02 Oct '20

02 Oct '20

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

Zebediah Figura : tests: Import HLSL majority tests from Wine.
by Alexandre Julliard 02 Oct '20

02 Oct '20

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 HLSL array dimension tests from Wine.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: vkd3d Branch: master Commit: d0b13d51cacbb544b9208f0518cff4359801ec0d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d0b13d51cacbb544b9208f0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 1 23:09:47 2020 -0500 tests: Import HLSL array dimension 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-array-dimension.shader_test | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/Makefile.am b/Makefile.am index efe0c7c..7911a8e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,6 +51,7 @@ vkd3d_shader_runners = \ vkd3d_shader_tests = \ tests/conditional.shader_test \ + tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ @@ -186,6 +187,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-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ diff --git a/tests/hlsl-array-dimension.shader_test b/tests/hlsl-array-dimension.shader_test new file mode 100644 index 0000000..fdb52b1 --- /dev/null +++ b/tests/hlsl-array-dimension.shader_test @@ -0,0 +1,16 @@ +# Test what kinds of expressions are valid array dimensions. +[pixel shader] +float4 main() : sv_target +{ + const int dim = 4; + float a[2 * 2] = {0.1, 0.2, 0.3, 0.4}; + float b[4.1] = a; + float c[dim] = b; + float d[true] = {c[0]}; + float e[65536]; + return float4(d[0], c[0], c[1], c[3]); +} + +[test] +draw quad +probe all rgba (0.1, 0.1, 0.2, 0.4)

1 0

Zebediah Figura : tests: Import HLSL return statement tests from Wine.
by Alexandre Julliard 02 Oct '20

02 Oct '20

Module: vkd3d Branch: master Commit: e04b917322bc0371404caaed946e49d8010ab18b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e04b917322bc0371404caae… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 1 23:09:46 2020 -0500 tests: Import HLSL return statement 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-return-implicit-conversion.shader_test | 9 +++++++++ tests/hlsl-return-void.shader_test | 11 +++++++++++ 3 files changed, 24 insertions(+) diff --git a/Makefile.am b/Makefile.am index c6d9b06..efe0c7c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,6 +52,8 @@ vkd3d_shader_runners = \ vkd3d_shader_tests = \ tests/conditional.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-return-implicit-conversion.shader_test \ + tests/hlsl-return-void.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ @@ -185,6 +187,8 @@ SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ tests/conditional.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-return-implicit-conversion.shader_test \ + tests/hlsl-return-void.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ diff --git a/tests/hlsl-return-implicit-conversion.shader_test b/tests/hlsl-return-implicit-conversion.shader_test new file mode 100644 index 0000000..527387b --- /dev/null +++ b/tests/hlsl-return-implicit-conversion.shader_test @@ -0,0 +1,9 @@ +[pixel shader] +float4 main() : sv_target +{ + return float2x2(0.4, 0.3, 0.2, 0.1); +} + +[test] +draw quad +probe all rgba (0.4, 0.3, 0.2, 0.1) diff --git a/tests/hlsl-return-void.shader_test b/tests/hlsl-return-void.shader_test new file mode 100644 index 0000000..1948ec5 --- /dev/null +++ b/tests/hlsl-return-void.shader_test @@ -0,0 +1,11 @@ +[pixel shader] +void main(out float4 ret : sv_target) +{ + ret = float4(0.1, 0.2, 0.3, 0.4); + return; + ret = float4(0.5, 0.6, 0.7, 0.8); +} + +[test] +draw quad +probe all rgba (0.1, 0.2, 0.3, 0.4)

1 0

← Newer
1
...
72
73
74
75
76
77
78
79
80
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 October 2020