March 2022 - Wine-commits - list.winehq.org

Huw Davies : winealsa: Move MIDM_GETNUMDEVS to the unixlib.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: 725ed69221fc7c856a399729cacfbb073ce77d7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=725ed69221fc7c856a399729… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 22 08:56:42 2022 -0500 winealsa: Move MIDM_GETNUMDEVS to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/alsamidi.c | 3 +++ dlls/winealsa.drv/midi.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 037f404771b..f12eefdd1a3 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -953,6 +953,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_GETDEVCAPS: *params->err = midi_in_get_devcaps(params->dev_id, (MIDIINCAPSW *)params->param_1, params->param_2); break; + case MIDM_GETNUMDEVS: + *params->err = num_srcs; + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 4903b46089d..bd73c1f5db2 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -594,8 +594,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midClose(wDevID); case MIDM_ADDBUFFER: return midAddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MIDM_GETNUMDEVS: - return MIDM_NumDevs; case MIDM_RESET: return midReset(wDevID); case MIDM_START:

1 0

Alexandre Julliard : po: Regenerate po files.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: 9e939d148d44aba78e1ef4a70103eaf839ea53e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e939d148d44aba78e1ef4a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 21 23:23:16 2022 +0100 po: Regenerate po files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 22 +++++++++++++++------- po/ast.po | 22 +++++++++++++++------- po/bg.po | 22 +++++++++++++++------- po/ca.po | 24 +++++++++++++++++------- po/cs.po | 22 +++++++++++++++------- po/da.po | 22 +++++++++++++++------- po/de.po | 24 +++++++++++++++++------- po/el.po | 22 +++++++++++++++------- po/en.po | 22 +++++++++++++++------- po/en_US.po | 22 +++++++++++++++------- po/eo.po | 22 +++++++++++++++------- po/es.po | 24 +++++++++++++++++------- po/fa.po | 22 +++++++++++++++------- po/fi.po | 24 +++++++++++++++++------- po/fr.po | 22 +++++++++++++++------- po/he.po | 22 +++++++++++++++------- po/hi.po | 22 +++++++++++++++------- po/hr.po | 22 +++++++++++++++------- po/hu.po | 22 +++++++++++++++------- po/it.po | 22 +++++++++++++++------- po/ja.po | 24 +++++++++++++++++------- po/ko.po | 24 +++++++++++++++++------- po/lt.po | 24 +++++++++++++++++------- po/ml.po | 22 +++++++++++++++------- po/nb_NO.po | 22 +++++++++++++++------- po/nl.po | 24 +++++++++++++++++------- po/or.po | 22 +++++++++++++++------- po/pa.po | 22 +++++++++++++++------- po/pl.po | 24 +++++++++++++++++------- po/pt_BR.po | 24 +++++++++++++++++------- po/pt_PT.po | 22 +++++++++++++++------- po/rm.po | 22 +++++++++++++++------- po/ro.po | 22 +++++++++++++++------- po/ru.po | 22 +++++++++++++++------- po/si.po | 22 +++++++++++++++------- po/sk.po | 22 +++++++++++++++------- po/sl.po | 22 +++++++++++++++------- po/sr_RS(a)cyrillic.po | 22 +++++++++++++++------- po/sr_RS(a)latin.po | 22 +++++++++++++++------- po/sv.po | 22 +++++++++++++++------- po/ta.po | 22 +++++++++++++++------- po/te.po | 22 +++++++++++++++------- po/th.po | 22 +++++++++++++++------- po/tr.po | 22 +++++++++++++++------- po/uk.po | 24 +++++++++++++++++------- po/wa.po | 22 +++++++++++++++------- po/wine.pot | 22 +++++++++++++++------- po/zh_CN.po | 24 +++++++++++++++++------- po/zh_TW.po | 24 +++++++++++++++++------- 49 files changed, 761 insertions(+), 343 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e939d148d44aba78e1e…

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in pipe.c.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: 3a0448f82bc92b925dd215cc14f8e46c204a8c83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a0448f82bc92b925dd215cc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 22 08:22:54 2022 +0100 ntdll/tests: Enable compilation with long types in pipe.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 749 ++++++++++++++++++++++++------------------------ 1 file changed, 375 insertions(+), 374 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a0448f82bc92b925dd2…

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in port.c.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: df94b7b435bf8f5b2c48fc8894216d4a90336e5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=df94b7b435bf8f5b2c48fc88… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 22 08:22:58 2022 +0100 ntdll/tests: Enable compilation with long types in port.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/port.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/tests/port.c b/dlls/ntdll/tests/port.c index 2406a63d8f1..9c8c26a8174 100644 --- a/dlls/ntdll/tests/port.c +++ b/dlls/ntdll/tests/port.c @@ -16,6 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdio.h> #include <stdarg.h> @@ -183,10 +184,10 @@ static void ProcessConnectionRequest(union lpc_message *LpcMessage, PHANDLE pAcc } status = pNtAcceptConnectPort(pAcceptPortHandle, 0, &LpcMessage->msg, 1, NULL, NULL); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status); status = pNtCompleteConnectPort(*pAcceptPortHandle); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status); } static void ProcessLpcRequest(HANDLE PortHandle, union lpc_message *LpcMessage) @@ -202,7 +203,7 @@ static void ProcessLpcRequest(HANDLE PortHandle, union lpc_message *LpcMessage) strcpy((LPSTR)LpcMessage->msg64.Data, REPLY); status = pNtReplyPort(PortHandle, &LpcMessage->msg); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status); ok(LpcMessage->msg64.MessageType == LPC_REQUEST, "Expected LPC_REQUEST, got %d\n", LpcMessage->msg64.MessageType); ok(!strcmp((LPSTR)LpcMessage->msg64.Data, REPLY), @@ -217,7 +218,7 @@ static void ProcessLpcRequest(HANDLE PortHandle, union lpc_message *LpcMessage) strcpy((LPSTR)LpcMessage->msg.Data, REPLY); status = pNtReplyPort(PortHandle, &LpcMessage->msg); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status); ok(LpcMessage->msg.MessageType == LPC_REQUEST, "Expected LPC_REQUEST, got %d\n", LpcMessage->msg.MessageType); ok(!strcmp((LPSTR)LpcMessage->msg.Data, REPLY), @@ -239,11 +240,11 @@ static DWORD WINAPI test_ports_client(LPVOID arg) sqos.EffectiveOnly = TRUE; status = pNtConnectPort(&PortHandle, &port, &sqos, 0, 0, &len, NULL, NULL); - todo_wine ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); + todo_wine ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status); if (status != STATUS_SUCCESS) return 1; status = pNtRegisterThreadTerminatePort(PortHandle); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status); if (is_wow64) { @@ -256,7 +257,7 @@ static DWORD WINAPI test_ports_client(LPVOID arg) strcpy((LPSTR)LpcMessage->msg64.Data, REQUEST1); status = pNtRequestPort(PortHandle, &LpcMessage->msg); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status); ok(LpcMessage->msg64.MessageType == 0, "Expected 0, got %d\n", LpcMessage->msg64.MessageType); ok(!strcmp((LPSTR)LpcMessage->msg64.Data, REQUEST1), "Expected %s, got %s\n", REQUEST1, LpcMessage->msg64.Data); @@ -269,7 +270,7 @@ static DWORD WINAPI test_ports_client(LPVOID arg) /* Send the message and wait for the reply */ status = pNtRequestWaitReplyPort(PortHandle, &LpcMessage->msg, &out->msg); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status); ok(!strcmp((LPSTR)out->msg64.Data, REPLY), "Expected %s, got %s\n", REPLY, out->msg64.Data); ok(out->msg64.MessageType == LPC_REPLY, "Expected LPC_REPLY, got %d\n", out->msg64.MessageType); } @@ -284,7 +285,7 @@ static DWORD WINAPI test_ports_client(LPVOID arg) strcpy((LPSTR)LpcMessage->msg.Data, REQUEST1); status = pNtRequestPort(PortHandle, &LpcMessage->msg); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status); ok(LpcMessage->msg.MessageType == 0, "Expected 0, got %d\n", LpcMessage->msg.MessageType); ok(!strcmp((LPSTR)LpcMessage->msg.Data, REQUEST1), "Expected %s, got %s\n", REQUEST1, LpcMessage->msg.Data); @@ -297,7 +298,7 @@ static DWORD WINAPI test_ports_client(LPVOID arg) /* Send the message and wait for the reply */ status = pNtRequestWaitReplyPort(PortHandle, &LpcMessage->msg, &out->msg); - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %lx\n", status); ok(!strcmp((LPSTR)out->msg.Data, REPLY), "Expected %s, got %s\n", REPLY, out->msg.Data); ok(out->msg.MessageType == LPC_REPLY, "Expected LPC_REPLY, got %d\n", out->msg.MessageType); } @@ -324,7 +325,7 @@ static void test_ports_server( HANDLE PortHandle ) status = pNtReplyWaitReceivePort(PortHandle, NULL, NULL, &LpcMessage->msg); todo_wine { - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %d(%x)\n", status, status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %ld(%lx)\n", status, status); } /* STATUS_INVALID_HANDLE: win2k without admin rights will perform an * endless loop here @@ -384,7 +385,7 @@ START_TEST(port) status = pNtCreatePort(&port_handle, &obj, 100, 100, 0); if (status == STATUS_ACCESS_DENIED) skip("Not enough rights\n"); - else ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %d\n", status); + else ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %ld\n", status); if (status == STATUS_SUCCESS) {

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in info.c.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: 6ab71c6ac2146e6555a0b433d33b1000c795dbaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ab71c6ac2146e6555a0b433… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 22 08:22:47 2022 +0100 ntdll/tests: Enable compilation with long types in info.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 1289 ++++++++++++++++++++++++----------------------- 1 file changed, 645 insertions(+), 644 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ab71c6ac2146e6555a0…

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in reg.c.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: f06f4db4474226568801ac8bb79db31068e8cead URL: https://source.winehq.org/git/wine.git/?a=commit;h=f06f4db4474226568801ac8b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 22 08:23:01 2022 +0100 ntdll/tests: Enable compilation with long types in reg.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 739 +++++++++++++++++++++++++------------------------ 1 file changed, 370 insertions(+), 369 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f06f4db4474226568801…

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in path.c.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: wine Branch: master Commit: 010315571e6371821b793f92f5162e2cc6921497 URL: https://source.winehq.org/git/wine.git/?a=commit;h=010315571e6371821b793f92… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 22 08:22:51 2022 +0100 ntdll/tests: Enable compilation with long types in path.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/path.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 5211945437c..dba42688e05 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include "ntdll_test.h" #include "winnls.h" @@ -375,7 +376,7 @@ static void test_RtlGetFullPathName_U(void) file_part = (WCHAR *)0xdeadbeef; lstrcpyW(rbufferW, deadbeefW); ret = pRtlGetFullPathName_U(NULL, MAX_PATH, rbufferW, &file_part); - ok(!ret, "Expected RtlGetFullPathName_U to return 0, got %u\n", ret); + ok(!ret, "Expected RtlGetFullPathName_U to return 0, got %lu\n", ret); ok(!lstrcmpW(rbufferW, deadbeefW), "Expected the output buffer to be untouched, got %s\n", wine_dbgstr_w(rbufferW)); ok(file_part == (WCHAR *)0xdeadbeef || @@ -385,7 +386,7 @@ static void test_RtlGetFullPathName_U(void) file_part = (WCHAR *)0xdeadbeef; lstrcpyW(rbufferW, deadbeefW); ret = pRtlGetFullPathName_U(emptyW, MAX_PATH, rbufferW, &file_part); - ok(!ret, "Expected RtlGetFullPathName_U to return 0, got %u\n", ret); + ok(!ret, "Expected RtlGetFullPathName_U to return 0, got %lu\n", ret); ok(!lstrcmpW(rbufferW, deadbeefW), "Expected the output buffer to be untouched, got %s\n", wine_dbgstr_w(rbufferW)); ok(file_part == (WCHAR *)0xdeadbeef || @@ -398,7 +399,7 @@ static void test_RtlGetFullPathName_U(void) pRtlMultiByteToUnicodeN(pathbufW , sizeof(pathbufW), NULL, test->path, strlen(test->path)+1 ); ret = pRtlGetFullPathName_U( pathbufW,MAX_PATH, rbufferW, &file_part); ok( ret == len || (test->alt_rname && ret == strlen(test->alt_rname)*sizeof(WCHAR)), - "Wrong result %d/%d for \"%s\"\n", ret, len, test->path ); + "Wrong result %ld/%d for \"%s\"\n", ret, len, test->path ); ok(pRtlUnicodeToMultiByteN(rbufferA,MAX_PATH,&reslen,rbufferW,(lstrlenW(rbufferW) + 1) * sizeof(WCHAR)) == STATUS_SUCCESS, "RtlUnicodeToMultiByteN failed\n"); ok(!lstrcmpA(rbufferA,test->rname) || (test->alt_rname && !lstrcmpA(rbufferA,test->alt_rname)), @@ -580,7 +581,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) if (pRtlDosPathNameToNtPathName_U_WithStatus) { status = pRtlDosPathNameToNtPathName_U_WithStatus(error_paths[i], &nameW, &file_part, NULL); - ok(status == STATUS_OBJECT_NAME_INVALID, "Got status %#x.\n", status); + ok(status == STATUS_OBJECT_NAME_INVALID, "Got status %#lx.\n", status); } winetest_pop_context(); @@ -600,7 +601,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) { RtlFreeUnicodeString(&nameW); status = pRtlDosPathNameToNtPathName_U_WithStatus(tests[i].dos, &nameW, &file_part, NULL); - ok(status == STATUS_SUCCESS, "%s: Got status %#x.\n", debugstr_w(tests[i].dos), status); + ok(status == STATUS_SUCCESS, "%s: Got status %#lx.\n", debugstr_w(tests[i].dos), status); } ok(!wcscmp(nameW.Buffer, tests[i].nt) @@ -711,7 +712,7 @@ static void test_nt_names(void) if (handle) NtClose( handle ); todo_wine_if( tests[i].todo ) ok( status == tests[i].expect || broken( tests[i].broken && status == tests[i].broken ), - "%u: got %x / %x for %s + %s\n", i, status, tests[i].expect, + "%u: got %lx / %lx for %s + %s\n", i, status, tests[i].expect, debugstr_w( tests[i].root ), debugstr_w( tests[i].name )); } }

1 0

Zebediah Figura : tests: Add support for running shader tests with a custom vertex shader.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: vkd3d Branch: master Commit: 52223250d7d88590e8c02f542792e9f78723c4c1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=52223250d7d88590e8c02f5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 21 20:42:14 2022 -0500 tests: Add support for running shader tests with a custom vertex shader. 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> --- tests/shader_runner.c | 15 +++++++++++++++ tests/shader_runner.h | 1 + tests/shader_runner_d3d11.c | 2 +- tests/shader_runner_d3d12.c | 38 ++++++++++++++++++++++++++------------ 4 files changed, 43 insertions(+), 13 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 910e6ecd..033fee0a 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -80,6 +80,7 @@ enum parse_state STATE_SAMPLER, STATE_SHADER_INVALID_PIXEL, STATE_SHADER_PIXEL, + STATE_SHADER_VERTEX, STATE_TEXTURE, STATE_TEST, }; @@ -501,6 +502,14 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const shader_source_size = 0; break; + case STATE_SHADER_VERTEX: + free(runner->vs_source); + runner->vs_source = shader_source; + shader_source = NULL; + shader_source_len = 0; + shader_source_size = 0; + break; + case STATE_SHADER_INVALID_PIXEL: { ID3D10Blob *blob = NULL, *errors = NULL; @@ -639,6 +648,10 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const { state = STATE_PREPROC_INVALID; } + else if (!strcmp(line, "[vertex shader]\n")) + { + state = STATE_SHADER_VERTEX; + } vkd3d_test_set_context("Section %.*s, line %u", strlen(line) - 1, line, line_number); } @@ -654,6 +667,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const case STATE_PREPROC_INVALID: case STATE_SHADER_INVALID_PIXEL: case STATE_SHADER_PIXEL: + case STATE_SHADER_VERTEX: { size_t len = strlen(line); @@ -682,6 +696,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const } } + free(runner->vs_source); free(runner->ps_source); for (i = 0; i < runner->texture_count; ++i) { diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 26fa2367..43ded853 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -72,6 +72,7 @@ struct shader_runner { const struct shader_runner_ops *ops; + char *vs_source; char *ps_source; enum shader_model minimum_shader_model; diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index c077718c..fb73f80e 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -434,7 +434,7 @@ static void d3d11_runner_draw_quad(struct shader_runner *r) if (!runner->vs) { - ID3D10Blob *vs_code = compile_shader(vs_source, "vs_4_0"); + ID3D10Blob *vs_code = compile_shader(runner->r.vs_source ? runner->r.vs_source : vs_source, "vs_4_0"); hr = ID3D11Device_CreateVertexShader(device, ID3D10Blob_GetBufferPointer(vs_code), ID3D10Blob_GetBufferSize(vs_code), NULL, &runner->vs); diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 4f077b38..e124922f 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -52,22 +52,23 @@ static struct d3d12_shader_runner *d3d12_shader_runner(struct shader_runner *r) return CONTAINING_RECORD(r, struct d3d12_shader_runner, r); } -static ID3D10Blob *compile_shader(const char *source, enum shader_model shader_model) +static ID3D10Blob *compile_shader(const char *source, const char *type, enum shader_model shader_model) { ID3D10Blob *blob = NULL, *errors = NULL; + char profile[7]; HRESULT hr; static const char *const shader_models[] = { - [SHADER_MODEL_2_0] = "ps_4_0", - [SHADER_MODEL_4_0] = "ps_4_0", - [SHADER_MODEL_4_1] = "ps_4_1", - [SHADER_MODEL_5_0] = "ps_5_0", - [SHADER_MODEL_5_1] = "ps_5_1", + [SHADER_MODEL_2_0] = "4_0", + [SHADER_MODEL_4_0] = "4_0", + [SHADER_MODEL_4_1] = "4_1", + [SHADER_MODEL_5_0] = "5_0", + [SHADER_MODEL_5_1] = "5_1", }; - hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", - shader_models[shader_model], 0, 0, &blob, &errors); + sprintf(profile, "%s_%s", type, shader_models[shader_model]); + hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", profile, 0, 0, &blob, &errors); ok(hr == S_OK, "Failed to compile shader, hr %#x.\n", hr); if (errors) { @@ -132,17 +133,23 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) ID3D12CommandQueue *queue = test_context->queue; D3D12_STATIC_SAMPLER_DESC static_samplers[1]; ID3D12Device *device = test_context->device; + ID3D10Blob *vs_code = NULL, *ps_code; static const float clear_color[4]; + D3D12_SHADER_BYTECODE vs, ps; unsigned int uniform_index; - D3D12_SHADER_BYTECODE ps; ID3D12PipelineState *pso; - ID3D10Blob *ps_code; HRESULT hr; size_t i; - if (!(ps_code = compile_shader(runner->r.ps_source, runner->r.minimum_shader_model))) + if (!(ps_code = compile_shader(runner->r.ps_source, "ps", runner->r.minimum_shader_model))) return; + if (runner->r.vs_source && !(vs_code = compile_shader(runner->r.vs_source, "vs", runner->r.minimum_shader_model))) + { + ID3D10Blob_Release(ps_code); + return; + } + root_signature_desc.NumParameters = 0; root_signature_desc.pParameters = root_params; root_signature_desc.NumStaticSamplers = 0; @@ -202,10 +209,17 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) hr = create_root_signature(device, &root_signature_desc, &test_context->root_signature); ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + if (vs_code) + { + vs.pShaderBytecode = ID3D10Blob_GetBufferPointer(vs_code); + vs.BytecodeLength = ID3D10Blob_GetBufferSize(vs_code); + } ps.pShaderBytecode = ID3D10Blob_GetBufferPointer(ps_code); ps.BytecodeLength = ID3D10Blob_GetBufferSize(ps_code); pso = create_pipeline_state(device, test_context->root_signature, - test_context->render_target_desc.Format, NULL, &ps, NULL); + test_context->render_target_desc.Format, vs_code ? &vs : NULL, &ps, NULL); + if (vs_code) + ID3D10Blob_Release(vs_code); ID3D10Blob_Release(ps_code); if (!pso) return;

1 0

Zebediah Figura : tests: Specify the default vertex shader in the shader runner frontend.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: vkd3d Branch: master Commit: 16b383aef58974bd1f5bb9649e7730068c2601b0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=16b383aef58974bd1f5bb96… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 21 20:42:15 2022 -0500 tests: Specify the default vertex shader in the shader runner frontend. 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> --- tests/shader_runner.c | 10 +++++++++ tests/shader_runner_d3d11.c | 54 +++++++++++++++++++-------------------------- tests/shader_runner_d3d12.c | 16 +++++--------- 3 files changed, 39 insertions(+), 41 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 033fee0a..a2aecf9f 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -290,6 +290,16 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) { if (match_string(line, "draw quad", &line)) { + static const char vs_source[] = + "void main(uint id : SV_VertexID, out float4 position : SV_Position)\n" + "{\n" + " float2 coords = float2((id << 1) & 2, id & 2);\n" + " position = float4(coords * float2(2, -2) + float2(-1, 1), 0, 1);\n" + "}"; + + if (!runner->vs_source) + runner->vs_source = strdup(vs_source); + runner->ops->draw_quad(runner); } else if (match_string(line, "probe all rgba", &line)) diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index fb73f80e..f4049444 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -61,8 +61,6 @@ struct d3d11_shader_runner ID3D11Texture2D *rt; ID3D11RenderTargetView *rtv; ID3D11DeviceContext *immediate_context; - - ID3D11VertexShader *vs; }; static struct d3d11_shader_runner *d3d11_shader_runner(struct shader_runner *r) @@ -74,11 +72,22 @@ static bool enable_debug_layer; static bool use_warp_adapter; static unsigned int use_adapter_idx; -static ID3D10Blob *compile_shader(const char *source, const char *profile) +static ID3D10Blob *compile_shader(const char *source, const char *type, enum shader_model shader_model) { ID3D10Blob *blob = NULL, *errors = NULL; + char profile[7]; HRESULT hr; + static const char *const shader_models[] = + { + [SHADER_MODEL_2_0] = "4_0", + [SHADER_MODEL_4_0] = "4_0", + [SHADER_MODEL_4_1] = "4_1", + [SHADER_MODEL_5_0] = "5_0", + [SHADER_MODEL_5_1] = "5_1", + }; + + sprintf(profile, "%s_%s", type, shader_models[shader_model]); hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", profile, 0, 0, &blob, &errors); ok(hr == S_OK, "Failed to compile shader, hr %#lx.\n", hr); if (errors) @@ -323,9 +332,6 @@ static void destroy_test_context(struct d3d11_shader_runner *runner) { ULONG ref; - if (runner->vs) - ID3D11VertexShader_Release(runner->vs); - ID3D11DeviceContext_Release(runner->immediate_context); ID3D11RenderTargetView_Release(runner->rtv); ID3D11Texture2D_Release(runner->rt); @@ -405,43 +411,28 @@ static void d3d11_runner_destroy_texture(struct shader_runner *r, struct texture static void d3d11_runner_draw_quad(struct shader_runner *r) { - static const char vs_source[] = - "void main(uint id : SV_VertexID, out float4 position : SV_Position)\n" - "{\n" - " float2 coords = float2((id << 1) & 2, id & 2);\n" - " position = float4(coords * float2(2, -2) + float2(-1, 1), 0, 1);\n" - "}"; - struct d3d11_shader_runner *runner = d3d11_shader_runner(r); ID3D11Device *device = runner->device; + ID3D10Blob *vs_code, *ps_code; ID3D11Buffer *cb = NULL; + ID3D11VertexShader *vs; ID3D11PixelShader *ps; - ID3D10Blob *ps_code; unsigned int i; HRESULT hr; - static const char *const ps_profiles[] = - { - [SHADER_MODEL_2_0] = "ps_4_0", - [SHADER_MODEL_4_0] = "ps_4_0", - [SHADER_MODEL_4_1] = "ps_4_1", - [SHADER_MODEL_5_0] = "ps_5_0", - [SHADER_MODEL_5_1] = "ps_5_1", - }; - - if (!(ps_code = compile_shader(runner->r.ps_source, ps_profiles[runner->r.minimum_shader_model]))) + if (!(vs_code = compile_shader(runner->r.vs_source, "vs", runner->r.minimum_shader_model))) return; - if (!runner->vs) + if (!(ps_code = compile_shader(runner->r.ps_source, "ps", runner->r.minimum_shader_model))) { - ID3D10Blob *vs_code = compile_shader(runner->r.vs_source ? runner->r.vs_source : vs_source, "vs_4_0"); - - hr = ID3D11Device_CreateVertexShader(device, ID3D10Blob_GetBufferPointer(vs_code), - ID3D10Blob_GetBufferSize(vs_code), NULL, &runner->vs); - ok(hr == S_OK, "Failed to create vertex shader, hr %#lx.\n", hr); ID3D10Blob_Release(vs_code); + return; } + hr = ID3D11Device_CreateVertexShader(device, ID3D10Blob_GetBufferPointer(vs_code), + ID3D10Blob_GetBufferSize(vs_code), NULL, &vs); + ok(hr == S_OK, "Failed to create vertex shader, hr %#lx.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(ps_code), ID3D10Blob_GetBufferSize(ps_code), NULL, &ps); ok(hr == S_OK, "Failed to create pixel shader, hr %#lx.\n", hr); @@ -482,12 +473,13 @@ static void d3d11_runner_draw_quad(struct shader_runner *r) } ID3D11DeviceContext_IASetPrimitiveTopology(runner->immediate_context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST); - ID3D11DeviceContext_VSSetShader(runner->immediate_context, runner->vs, NULL, 0); + ID3D11DeviceContext_VSSetShader(runner->immediate_context, vs, NULL, 0); ID3D11DeviceContext_PSSetShader(runner->immediate_context, ps, NULL, 0); ID3D11DeviceContext_Draw(runner->immediate_context, 3, 0); ID3D11PixelShader_Release(ps); + ID3D11VertexShader_Release(vs); if (cb) ID3D11Buffer_Release(cb); } diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index e124922f..befa7f2f 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -133,8 +133,8 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) ID3D12CommandQueue *queue = test_context->queue; D3D12_STATIC_SAMPLER_DESC static_samplers[1]; ID3D12Device *device = test_context->device; - ID3D10Blob *vs_code = NULL, *ps_code; static const float clear_color[4]; + ID3D10Blob *vs_code, *ps_code; D3D12_SHADER_BYTECODE vs, ps; unsigned int uniform_index; ID3D12PipelineState *pso; @@ -144,7 +144,7 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) if (!(ps_code = compile_shader(runner->r.ps_source, "ps", runner->r.minimum_shader_model))) return; - if (runner->r.vs_source && !(vs_code = compile_shader(runner->r.vs_source, "vs", runner->r.minimum_shader_model))) + if (!(vs_code = compile_shader(runner->r.vs_source, "vs", runner->r.minimum_shader_model))) { ID3D10Blob_Release(ps_code); return; @@ -209,17 +209,13 @@ static void d3d12_runner_draw_quad(struct shader_runner *r) hr = create_root_signature(device, &root_signature_desc, &test_context->root_signature); ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); - if (vs_code) - { - vs.pShaderBytecode = ID3D10Blob_GetBufferPointer(vs_code); - vs.BytecodeLength = ID3D10Blob_GetBufferSize(vs_code); - } + vs.pShaderBytecode = ID3D10Blob_GetBufferPointer(vs_code); + vs.BytecodeLength = ID3D10Blob_GetBufferSize(vs_code); ps.pShaderBytecode = ID3D10Blob_GetBufferPointer(ps_code); ps.BytecodeLength = ID3D10Blob_GetBufferSize(ps_code); pso = create_pipeline_state(device, test_context->root_signature, - test_context->render_target_desc.Format, vs_code ? &vs : NULL, &ps, NULL); - if (vs_code) - ID3D10Blob_Release(vs_code); + test_context->render_target_desc.Format, &vs, &ps, NULL); + ID3D10Blob_Release(vs_code); ID3D10Blob_Release(ps_code); if (!pso) return;

1 0

Zebediah Figura : tests: Allow specifying a custom input layout.
by Alexandre Julliard 22 Mar '22

22 Mar '22

Module: vkd3d Branch: master Commit: 3ed4c6fe23a07424b3d421af1265b32eb29fb9bb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3ed4c6fe23a07424b3d421a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 21 20:42:16 2022 -0500 tests: Allow specifying a custom input layout. 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> --- tests/shader_runner.c | 63 ++++++++++++++++++++++++++++++++++++++++----- tests/shader_runner.h | 12 +++++++++ tests/shader_runner_d3d11.c | 41 ++++++++++++++++++++++++----- tests/shader_runner_d3d12.c | 23 ++++++++++++++++- 4 files changed, 124 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=3ed4c6fe23a07424b3d…

1 0