February 2021 - Wine-Devel - list.winehq.org

[PATCH 1/2] tests: Add ignore_exceptions().
by Francois Gouget Feb. 12, 2021

Feb. 12, 2021

This lets tests signal that for a while exceptions are expected and should not be counted as test failures. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- include/wine/test.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index 787fea0ba24..4408366566c 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -61,6 +61,7 @@ extern const char *winetest_platform; extern void winetest_set_location( const char* file, int line ); extern void winetest_subtest( const char* name ); +extern void winetest_ignore_exceptions( BOOL ignore ); extern void winetest_start_todo( int is_todo ); extern int winetest_loop_todo(void); extern void winetest_end_todo(void); @@ -97,6 +98,7 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __WINE_PRINT #ifdef WINETEST_NO_LINE_NUMBERS # define subtest_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_subtest +# define ignore_exceptions_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_ignore_exceptions # define ok_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_ok # define skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_skip # define win_skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_win_skip @@ -104,6 +106,7 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __WINE_PRINT # define wait_child_process_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_wait_child_process #else # define subtest_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_subtest +# define ignore_exceptions_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ignore_exceptions # define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok # define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip # define win_skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_win_skip @@ -112,6 +115,7 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __WINE_PRINT #endif #define subtest subtest_(__FILE__, __LINE__) +#define ignore_exceptions ignore_exceptions_(__FILE__, __LINE__) #define ok ok_(__FILE__, __LINE__) #define skip skip_(__FILE__, __LINE__) #define win_skip win_skip_(__FILE__, __LINE__) @@ -298,6 +302,14 @@ void winetest_subtest( const char* name ) data->current_file, data->current_line, winetest_elapsed(), name ); } +void winetest_ignore_exceptions( BOOL ignore ) +{ + struct tls_data *data = get_tls_data(); + printf( "%s:%d:%s IgnoreExceptions=%d\n", + data->current_file, data->current_line, winetest_elapsed(), + ignore ? 1 : 0 ); +} + int broken( int condition ) { return (strcmp(winetest_platform, "windows") == 0) && condition; -- 2.20.1

2 3

[PATCH vkd3d 1/5] vkd3d-shader: Use hlsl_report_message() to report use of reserved keywords.
by Zebediah Figura Feb. 12, 2021

Feb. 12, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.l | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index b1090844..7e1fe14d 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -65,8 +65,8 @@ ANY (.) {RESERVED4} { struct hlsl_ctx *ctx = yyget_extra(yyscanner); - hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", ctx->line_no, yytext); - set_parse_status(&ctx->status, PARSE_ERR); + hlsl_report_message(ctx, *yylloc, HLSL_LEVEL_ERROR, + "Reserved keyword \"%s\" used.\n", yytext); } BlendState {return KW_BLENDSTATE; } -- 2.30.0

4 12

[PATCH v2 1/3] vcomp: Change _vcomp_fork_call_wrapper() args parameter type to void **.
by Paul Gofman Feb. 12, 2021

Feb. 12, 2021

That is assumed in the asm implementation. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - use a helper function for valist conversion. dlls/vcomp/main.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 7b97dfc72c8..e5d946dca12 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -117,9 +117,14 @@ struct vcomp_task_data unsigned int dynamic_chunksize; }; +static void **ptr_from_va_list(__ms_va_list valist) +{ + return (void **)valist; +} + #if defined(__i386__) -extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); +extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, void **args); __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, "pushl %ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") @@ -154,7 +159,7 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, #elif defined(__x86_64__) -extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); +extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, void **args); __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, "pushq %rbp\n\t" __ASM_SEH(".seh_pushreg %rbp\n\t") @@ -198,7 +203,7 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, #elif defined(__arm__) -extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); +extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, void **args); __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, "push {r4, r5, LR}\n\t" "mov r4, r0\n\t" @@ -234,7 +239,7 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, #elif defined(__aarch64__) -extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); +extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, void **args); __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, "stp x29, x30, [SP,#-16]!\n\t" "mov x29, SP\n\t" @@ -263,7 +268,7 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, #else -static void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args) +static void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, void **args) { ERR("Not implemented for this architecture\n"); } @@ -1406,7 +1411,7 @@ static DWORD WINAPI _vcomp_fork_worker(void *param) if (team != NULL) { LeaveCriticalSection(&vcomp_section); - _vcomp_fork_call_wrapper(team->wrapper, team->nargs, team->valist); + _vcomp_fork_call_wrapper(team->wrapper, team->nargs, ptr_from_va_list(team->valist)); EnterCriticalSection(&vcomp_section); thread_data->team = NULL; @@ -1540,7 +1545,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) } vcomp_set_thread_data(&thread_data); - _vcomp_fork_call_wrapper(team_data.wrapper, team_data.nargs, team_data.valist); + _vcomp_fork_call_wrapper(team_data.wrapper, team_data.nargs, ptr_from_va_list(team_data.valist)); vcomp_set_thread_data(prev_thread_data); prev_thread_data->fork_threads = 0; -- 2.29.2

2 3

[tools 1/2] winetest/dissect: Link child exception lines to the source.
by Francois Gouget Feb. 12, 2021

Feb. 12, 2021

Move the trace handling because it also matches the child exception lines now. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This brings dissect in line with this Wine patch: tests: Trace the filename in winetest_wait_child_process(). https://www.winehq.org/pipermail/wine-devel/2021-February/180822.html winetest/dissect | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index c1590ba01..d2ef10d42 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -661,15 +661,6 @@ while ($line = <IN>) { # Don't complain and don't count misplaced skips $skipped++ if ($units{$l_unit}); } - elsif (($unit ne "" and - $line =~ /^(.*?)($units_re)\.c:(\d+): (.*)$/) or - $line =~ /^()([_a-z0-9]+)\.c:(\d+): (.*)$/) - { - my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); - add_test_line("trace", escapeHTML($pollution) . - get_source_link($l_unit, $l_num) .": ". - escapeHTML($l_text)); - } elsif (($unit ne "" and $line =~ /([0-9a-f]+):($units_re): unhandled exception [0-9a-fA-F]{8} at /) or $line =~ /^([0-9a-f]+):([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at /) @@ -694,20 +685,31 @@ while ($line = <IN>) { add_test_line("failed", escapeHTML($line)); } elsif (($unit ne "" and - $line =~ /($units_re):\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) or - $line =~ /^([_.a-z0-9]+):\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) + $line =~ /^(.*?)($units_re)\.c:(\d+): (unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+).*)$/) or + $line =~ /^()([_.a-z0-9]+)\.c:(\d+): (unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+).*)$/) { - my ($l_unit, $l_pid) = ($1, $2); + my ($pollution, $l_unit, $l_num, $l_text, $l_pid) = ($1, $2, $3, $4, $5); if ($units{$l_unit}) { # This also replaces a test summary line. $pids{$l_pid || 0} = 1; $s_failures++; } - add_test_line("failed", escapeHTML($line)); + add_test_line("failed", escapeHTML($pollution) . + get_source_link($l_unit, $l_num) .": ". + escapeHTML($l_text)); check_unit($l_unit, "child exception"); $failures++; } + elsif (($unit ne "" and + $line =~ /^(.*?)($units_re)\.c:(\d+): (.*)$/) or + $line =~ /^()([_a-z0-9]+)\.c:(\d+): (.*)$/) + { + my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); + add_test_line("trace", escapeHTML($pollution) . + get_source_link($l_unit, $l_num) .": ". + escapeHTML($l_text)); + } elsif (($unit ne "" and $line =~ /([0-9a-f]+):($unit): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) or $line =~ /^([0-9a-f]+):([_a-z0-9]+): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) -- 2.20.1

1 1

[tools] testbot/reporttest: Add a test for IgnoreExceptions.
by Francois Gouget Feb. 12, 2021

Feb. 12, 2021

All exceptions should be ignored when IgnoreExceptions=1. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This adds tests for the following patch: tests: Add ignore_exceptions(). https://www.winehq.org/pipermail/wine-devel/2021-February/180823.html testbot/src/reporttest/report.template | 19 ++++++++++++++++++- testbot/src/reporttest/report.testwtbs | 8 +++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index da4ce50ce..60fa9befe 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -571,7 +571,24 @@ stub comctl32:treeview stub comctl32:updown stub comdlg32:filedlg stub comdlg32:finddlg -stub comdlg32:fontdlg + +comctl32:fontdlg start dlls/comctl32/tests/fontdlg.c - +----- Check support for IgnoreExceptions +----- Expected assessement: 6 failures +01bd:fontdlg: unhandled exception c0000005 at 00001111 +Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00001111). +fontdlg.c:10: unhandled exception c0000005 in child process 1111 +fontdlg.c:12: IgnoreExceptions=1 +01bd:fontdlg: unhandled exception c0000005 at 00002222 +Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00002222). +fontdlg.c:20: unhandled exception c0000005 in child process 2222 +fontdlg.c:22: IgnoreExceptions=0 +01bd:fontdlg: unhandled exception c0000005 at 00003333 +Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00003333). +fontdlg.c:30: unhandled exception c0000005 in child process 3333 +01bd:fontdlg: 10 tests executed (0 marked as todo, 6 failures), 0 skipped. +comctl32:fontdlg:01bd done (6) in 0s + stub comdlg32:itemdlg stub comdlg32:printdlg stub credui:credui diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index 64057bcb5..208c014ef 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -13,7 +13,7 @@ with: ----- TestWTBS ----- -p tests.TestFailures 45 +p tests.TestFailures 51 p build.HasTask 0 a wine.log.GrepV ^Applying patch @@ -50,6 +50,12 @@ n 0 1234:taskdialog: unhandled exception c0000005 at 0040167C n 0 taskdialog:471: unhandled exception c0000005 in child process 1234 n 0 driver.c:40: Test failed: Something wrong n 0 driver.c:41: Test succeeded inside todo block: Something right! +n 0 01bd:fontdlg: unhandled exception c0000005 at 00001111 +n 0 Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00001111). +n 0 fontdlg.c:10: unhandled exception c0000005 in child process 1111 +n 0 01bd:fontdlg: unhandled exception c0000005 at 00003333 +n 0 Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00003333). +n 0 fontdlg.c:30: unhandled exception c0000005 in child process 3333 g 0 tests.report.xmllite n 0 writer.c:20: Test failed: A delayed failure, typically in a subprocess -- 2.20.1

1 0

[tools] testbot/reporttest: Update the "in child process" test lines.
by Francois Gouget Feb. 12, 2021

Feb. 12, 2021

They should have a filename rather than just the unit name now, and one unit name was wrong anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This brings the tests in line with the following patch: tests: Trace the filename in winetest_wait_child_process(). https://www.winehq.org/pipermail/wine-devel/2021-February/180822.html Note that the incorrect unit name did not have an impact on the test results because it turns out that neither dissect nor the TestBot know about the "failures in child process" lines. testbot/src/reporttest/report.template | 4 ++-- testbot/src/reporttest/report.testwtbs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 60fa9befe..9b285337c 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -332,7 +332,7 @@ apphelp.c:41: Test succeeded inside todo block: Success in the child process apphelp.c:42: Test marked todo: Fixme in the child process apphelp.c:43: Tests skipped: Skipped in the child process 4321:apphelp: 116 tests executed (1 marked as todo, 2 failures), 1 skipped. -timer:44: 2 failures in child process +apphelp.c:44: 2 failures in child process 0c9c:apphelp: 116 tests executed (0 marked as todo, 3 failures), 0 skipped. apphelp:apphelp:0c9c done (3) in 0s @@ -544,7 +544,7 @@ comctl32:taskdialog start dlls/comctl32/tests/taskdialog.c - ----- "in child process" line. See also comctl32:rebar. ----- Expected assessement: 1 failure 1234:taskdialog: unhandled exception c0000005 at 0040167C -taskdialog:33: unhandled exception c0000005 in child process 1234 +taskdialog.c:33: unhandled exception c0000005 in child process 1234 07b0:taskdialog: 3 tests executed (0 marked as todo, 1 failures), 0 skipped. comctl32:taskdialog:07b0 done (1) in 0s diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index 208c014ef..aa78c9e2d 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -47,7 +47,7 @@ n 0 Do not cut syslink.c:40: Test failed: Something wrong n 0 Do not cut syslink.c:41: Test succeeded inside todo block: Something right! n 0 Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x0054376d). n 0 1234:taskdialog: unhandled exception c0000005 at 0040167C -n 0 taskdialog:471: unhandled exception c0000005 in child process 1234 +n 0 taskdialog.c:471: unhandled exception c0000005 in child process 1234 n 0 driver.c:40: Test failed: Something wrong n 0 driver.c:41: Test succeeded inside todo block: Something right! n 0 01bd:fontdlg: unhandled exception c0000005 at 00001111 -- 2.20.1

1 0

[PATCH] tests: Trace the filename in winetest_wait_child_process().
by Francois Gouget Feb. 12, 2021

Feb. 12, 2021

We want the filename next to the line number, just like in every other trace. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- include/wine/test.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 4408366566c..078b0147c4f 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -519,14 +519,14 @@ void winetest_wait_child_process( HANDLE process ) { DWORD pid = GetProcessId( process ); printf( "%s:%d:%s unhandled exception %08x in child process %04x\n", - current_test->name, data->current_line, winetest_elapsed(), + data->current_file, data->current_line, winetest_elapsed(), exit_code, pid ); InterlockedIncrement( &failures ); } else if (exit_code) { printf( "%s:%d:%s %u failures in child process\n", - current_test->name, data->current_line, winetest_elapsed(), + data->current_file, data->current_line, winetest_elapsed(), exit_code ); while (exit_code-- > 0) InterlockedIncrement(&failures); -- 2.20.1

1 0

[PATCH vkd3d 3/3] vkd3d-shader: Keep track of declared SPIR-V input components.
by Henri Verbeet Feb. 12, 2021

Feb. 12, 2021

In particular, a shader may declare e.g. v6.x to refer to an output from the previous stage, and v6.y to refer to a builtin, or the other way around. At the same time, different hull shader phases may redeclare the same register. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 101 ++++++++++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 44 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 72bb61f1..148115a8 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1924,6 +1924,7 @@ struct vkd3d_symbol_register_data uint32_t member_idx; enum vkd3d_shader_component_type component_type; unsigned int write_mask; + uint32_t dcl_mask; unsigned int structure_stride; bool is_aggregate; /* An aggregate, i.e. a structure or an array. */ bool is_dynamically_indexed; /* If member_idx is a variable ID instead of a constant. */ @@ -2014,6 +2015,7 @@ static void vkd3d_symbol_set_register_info(struct vkd3d_symbol *symbol, symbol->info.reg.member_idx = 0; symbol->info.reg.component_type = component_type; symbol->info.reg.write_mask = write_mask; + symbol->info.reg.dcl_mask = 0; symbol->info.reg.structure_stride = 0; symbol->info.reg.is_aggregate = false; symbol->info.reg.is_dynamically_indexed = false; @@ -4193,6 +4195,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi enum vkd3d_shader_component_type component_type; uint32_t type_id, ptr_type_id, float_type_id; const struct vkd3d_spirv_builtin *builtin; + struct vkd3d_symbol *symbol = NULL; uint32_t val_id, input_id, var_id; struct vkd3d_symbol reg_symbol; struct vkd3d_symbol tmp_symbol; @@ -4271,41 +4274,43 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) { - input_id = RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry)->id; + symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); + input_id = symbol->id; } - else if (builtin) + else if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL && reg->type == VKD3DSPR_INCONTROLPOINT) { - input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, storage_class, array_size); - } - else - { - input_id = 0; + tmp_symbol = reg_symbol; + tmp_symbol.key.reg.type = VKD3DSPR_INPUT; - if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL && reg->type == VKD3DSPR_INCONTROLPOINT) + if ((entry = rb_get(&compiler->symbol_table, &tmp_symbol))) { - tmp_symbol = reg_symbol; - tmp_symbol.key.reg.type = VKD3DSPR_INPUT; - - if ((entry = rb_get(&compiler->symbol_table, &tmp_symbol))) - { - tmp_symbol = *RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry); - tmp_symbol.key.reg.type = VKD3DSPR_INCONTROLPOINT; - vkd3d_dxbc_compiler_put_symbol(compiler, &tmp_symbol); + symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); + tmp_symbol = *symbol; + tmp_symbol.key.reg.type = VKD3DSPR_INCONTROLPOINT; + vkd3d_dxbc_compiler_put_symbol(compiler, &tmp_symbol); - input_id = tmp_symbol.id; - } + input_id = symbol->id; } + } - if (!entry) + if (!symbol || ~symbol->info.reg.dcl_mask & signature_element->mask) + { + if (builtin) + { + input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, storage_class, array_size); + } + else { unsigned int location = reg_idx; - if (reg->type == VKD3DSPR_PATCHCONST) - location += compiler->input_signature->element_count; - input_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, storage_class, component_type, input_component_count, array_size); vkd3d_spirv_add_iface_variable(builder, input_id); + if (reg->type == VKD3DSPR_PATCHCONST) + { + vkd3d_spirv_build_op_decorate(builder, input_id, SpvDecorationPatch, NULL, 0); + location += compiler->input_signature->element_count; + } vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationLocation, location); if (component_idx) vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx); @@ -4314,28 +4319,27 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi } } - if (reg->type == VKD3DSPR_PATCHCONST) - vkd3d_spirv_build_op_decorate(builder, input_id, SpvDecorationPatch, NULL, 0); - - if (entry || !use_private_var) + if (!symbol) { var_id = input_id; - } - else - { - storage_class = SpvStorageClassPrivate; - var_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, - storage_class, VKD3D_SHADER_COMPONENT_FLOAT, component_count, array_size); - } + if (use_private_var) + { + storage_class = SpvStorageClassPrivate; + var_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, + storage_class, VKD3D_SHADER_COMPONENT_FLOAT, component_count, array_size); + } - if (!entry) - { vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, use_private_var ? VKD3D_SHADER_COMPONENT_FLOAT : component_type, write_mask); + reg_symbol.info.reg.dcl_mask |= signature_element->mask; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); } + else + { + symbol->info.reg.dcl_mask |= signature_element->mask; + } if (use_private_var) { @@ -4383,6 +4387,7 @@ static void vkd3d_dxbc_compiler_emit_input_register(struct vkd3d_dxbc_compiler * const struct vkd3d_spirv_builtin *builtin; struct vkd3d_symbol reg_symbol; struct rb_entry *entry; + uint32_t write_mask; uint32_t input_id; assert(!reg->idx[0].rel_addr); @@ -4402,8 +4407,10 @@ static void vkd3d_dxbc_compiler_emit_input_register(struct vkd3d_dxbc_compiler * input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, SpvStorageClassInput, 0); - vkd3d_symbol_set_register_info(&reg_symbol, input_id, SpvStorageClassInput, - builtin->component_type, vkd3d_write_mask_from_component_count(builtin->component_count)); + write_mask = vkd3d_write_mask_from_component_count(builtin->component_count); + vkd3d_symbol_set_register_info(&reg_symbol, input_id, + SpvStorageClassInput, builtin->component_type, write_mask); + reg_symbol.info.reg.dcl_mask = write_mask; reg_symbol.info.reg.is_aggregate = builtin->spirv_array_size; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, input_id, reg); @@ -4589,6 +4596,7 @@ static void vkd3d_dxbc_compiler_emit_output_register(struct vkd3d_dxbc_compiler const struct vkd3d_shader_register *reg = &dst->reg; const struct vkd3d_spirv_builtin *builtin; struct vkd3d_symbol reg_symbol; + uint32_t write_mask; uint32_t output_id; assert(!reg->idx[0].rel_addr); @@ -4604,8 +4612,10 @@ static void vkd3d_dxbc_compiler_emit_output_register(struct vkd3d_dxbc_compiler output_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, SpvStorageClassOutput, 0); vkd3d_symbol_make_register(&reg_symbol, reg); - vkd3d_symbol_set_register_info(&reg_symbol, output_id, SpvStorageClassOutput, - builtin->component_type, vkd3d_write_mask_from_component_count(builtin->component_count)); + write_mask = vkd3d_write_mask_from_component_count(builtin->component_count); + vkd3d_symbol_set_register_info(&reg_symbol, output_id, + SpvStorageClassOutput, builtin->component_type, write_mask); + reg_symbol.info.reg.dcl_mask = write_mask; reg_symbol.info.reg.is_aggregate = builtin->spirv_array_size; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, output_id, reg); @@ -4799,6 +4809,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler { reg_symbol.info.reg.member_idx = reg->idx[0].offset; } + reg_symbol.info.reg.dcl_mask = signature_element->mask; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); @@ -6275,9 +6286,9 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_input_initialisation(struct vkd const struct vkd3d_shader_signature_element *element; enum vkd3d_shader_input_sysval_semantic sysval; const struct vkd3d_spirv_builtin *builtin; + struct vkd3d_symbol *symbol, symbol_key; unsigned int register_count, i, j; struct vkd3d_shader_register r; - struct vkd3d_symbol symbol; struct rb_entry *entry; uint32_t indices[2]; @@ -6295,16 +6306,17 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_input_initialisation(struct vkd r.type = VKD3DSPR_INPUT; r.idx[0].offset = 0; r.idx[1].offset = ~0u; - vkd3d_symbol_make_register(&symbol, &r); + vkd3d_symbol_make_register(&symbol_key, &r); for (i = 0; i < signature->element_count; ++i) { element = &signature->elements[i]; - symbol.key.reg.idx = element->register_index; - entry = rb_get(&compiler->symbol_table, &symbol); - vicp_id = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry)->id; + symbol_key.key.reg.idx = element->register_index; + entry = rb_get(&compiler->symbol_table, &symbol_key); + symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); + vicp_id = symbol->id; register_index_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, element->register_index); dst_array_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, type_id, vicp_id, register_index_id); @@ -6350,6 +6362,7 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_input_initialisation(struct vkd vkd3d_spirv_build_op_copy_memory(builder, dst_array_id, src_array_id, SpvMemoryAccessMaskNone); } + symbol->info.reg.dcl_mask |= element->mask; } } -- 2.11.0

1 0

[PATCH vkd3d 2/3] tests: Add tessellation shader tests to test_clip_distance().
by Henri Verbeet Feb. 12, 2021

Feb. 12, 2021

Like the Wine d3d11 test it was originally ported from. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- tests/d3d12.c | 303 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 286 insertions(+), 17 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 609f15b5..3c8f6d90 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -28486,9 +28486,9 @@ static void test_cpu_descriptors_lifetime(void) destroy_test_context(&context); } -static void check_clip_distance(struct test_context *context, - ID3D12PipelineState *pso, D3D12_VERTEX_BUFFER_VIEW vbv[2], ID3D12Resource *vb, - ID3D12Resource *vs_cb, ID3D12Resource *gs_cb) +static void check_clip_distance(struct test_context *context, ID3D12PipelineState *pso, + D3D12_PRIMITIVE_TOPOLOGY topology, D3D12_VERTEX_BUFFER_VIEW vbv[2], ID3D12Resource *vb, + ID3D12Resource *vs_cb, ID3D12Resource *tess_cb, ID3D12Resource *gs_cb) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; struct vertex @@ -28511,10 +28511,14 @@ static void check_clip_distance(struct test_context *context, ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature); ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 1, + ID3D12Resource_GetGPUVirtualAddress(tess_cb)); ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(tess_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 3, ID3D12Resource_GetGPUVirtualAddress(gs_cb)); ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); - ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, topology); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect); ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 2, vbv); @@ -28535,10 +28539,14 @@ static void check_clip_distance(struct test_context *context, ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature); ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 1, + ID3D12Resource_GetGPUVirtualAddress(tess_cb)); ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(tess_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 3, ID3D12Resource_GetGPUVirtualAddress(gs_cb)); ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); - ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, topology); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect); ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 2, vbv); @@ -28559,10 +28567,14 @@ static void check_clip_distance(struct test_context *context, ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature); ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 1, + ID3D12Resource_GetGPUVirtualAddress(tess_cb)); ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(tess_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 3, ID3D12Resource_GetGPUVirtualAddress(gs_cb)); ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); - ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, topology); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect); ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 2, vbv); @@ -28583,10 +28595,14 @@ static void check_clip_distance(struct test_context *context, ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature); ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 1, + ID3D12Resource_GetGPUVirtualAddress(tess_cb)); ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(tess_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 3, ID3D12Resource_GetGPUVirtualAddress(gs_cb)); ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); - ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, topology); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect); ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 2, vbv); @@ -28612,10 +28628,14 @@ static void check_clip_distance(struct test_context *context, ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature); ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 1, + ID3D12Resource_GetGPUVirtualAddress(tess_cb)); ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(tess_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 3, ID3D12Resource_GetGPUVirtualAddress(gs_cb)); ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); - ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, topology); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect); ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 2, vbv); @@ -28637,11 +28657,11 @@ static void check_clip_distance(struct test_context *context, static void test_clip_distance(void) { + ID3D12Resource *vs_cb, *tess_cb, *gs_cb, *vb[2]; D3D12_ROOT_SIGNATURE_DESC root_signature_desc; D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; - D3D12_ROOT_PARAMETER root_parameters[3]; + D3D12_ROOT_PARAMETER root_parameters[4]; ID3D12GraphicsCommandList *command_list; - ID3D12Resource *vs_cb, *gs_cb, *vb[2]; D3D12_INPUT_LAYOUT_DESC input_layout; D3D12_VERTEX_BUFFER_VIEW vbv[2]; struct test_context_desc desc; @@ -28752,6 +28772,171 @@ static void test_clip_distance(void) 0x00000000, 0x00000000, 0x0010100a, 0x00000002, 0x0100003e, }; static const D3D12_SHADER_BYTECODE vs_multiple = {vs_multiple_code, sizeof(vs_multiple_code)}; +#if 0 + bool use_constant; + float clip_distance0; + float clip_distance1; + float tessellation_factor; + + struct vertex + { + float4 position : SV_POSITION; + float user_clip : CLIP_DISTANCE; + float clip : SV_ClipDistance; + }; + + struct patch_constant_data + { + float edges[4] : SV_TessFactor; + float inside[2] : SV_InsideTessFactor; + }; + + patch_constant_data patch_constant() + { + patch_constant_data output; + + output.edges[0] = tessellation_factor; + output.edges[1] = tessellation_factor; + output.edges[2] = tessellation_factor; + output.edges[3] = tessellation_factor; + output.inside[0] = tessellation_factor; + output.inside[1] = tessellation_factor; + + return output; + } + + [domain("quad")] + [outputcontrolpoints(4)] + [outputtopology("triangle_cw")] + [partitioning("pow2")] + [patchconstantfunc("patch_constant")] + vertex hs_main(InputPatch<vertex, 4> input, + uint i : SV_OutputControlPointID) + { + vertex o; + o.position = input[i].position; + o.user_clip = input[i].user_clip; + o.clip = input[i].user_clip; + return o; + } + + float4 interpolate_vec(float4 a, float4 b, float4 c, float4 d, float2 tess_coord) + { + float4 e = lerp(a, b, tess_coord.x); + float4 f = lerp(c, d, tess_coord.x); + return lerp(e, f, tess_coord.y); + } + + float interpolate(float a, float b, float c, float d, float2 tess_coord) + { + float e = lerp(a, b, tess_coord.x); + float f = lerp(c, d, tess_coord.x); + return lerp(e, f, tess_coord.y); + } + + [domain("quad")] + vertex ds_main(patch_constant_data input, + float2 tess_coord : SV_DomainLocation, + const OutputPatch<vertex, 4> patch) + { + vertex output; + + output.position = interpolate_vec(patch[0].position, patch[1].position, + patch[2].position, patch[3].position, tess_coord); + output.user_clip = interpolate(patch[0].user_clip, patch[1].user_clip, + patch[2].user_clip, patch[3].user_clip, tess_coord); + output.clip = interpolate(patch[0].clip, patch[1].clip, + patch[2].clip, patch[3].clip, tess_coord); + if (use_constant) + output.clip = clip_distance0; + + return output; + } +#endif + static const DWORD hs_code[] = + { + 0x43425844, 0x5a6d7564, 0x5f30a6c9, 0x2cf3b848, 0x5b4c6dca, 0x00000001, 0x00000414, 0x00000004, + 0x00000030, 0x000000b4, 0x00000138, 0x000001fc, 0x4e475349, 0x0000007c, 0x00000003, 0x00000008, + 0x00000050, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x0000005c, 0x00000000, + 0x00000000, 0x00000003, 0x00000001, 0x00000101, 0x0000006a, 0x00000000, 0x00000002, 0x00000003, + 0x00000002, 0x00000001, 0x505f5653, 0x5449534f, 0x004e4f49, 0x50494c43, 0x5349445f, 0x434e4154, + 0x56530045, 0x696c435f, 0x73694470, 0x636e6174, 0xabab0065, 0x4e47534f, 0x0000007c, 0x00000003, + 0x00000008, 0x00000050, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000005c, + 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000e01, 0x0000006a, 0x00000000, 0x00000002, + 0x00000003, 0x00000002, 0x00000e01, 0x505f5653, 0x5449534f, 0x004e4f49, 0x50494c43, 0x5349445f, + 0x434e4154, 0x56530045, 0x696c435f, 0x73694470, 0x636e6174, 0xabab0065, 0x47534350, 0x000000bc, + 0x00000006, 0x00000008, 0x00000098, 0x00000000, 0x0000000b, 0x00000003, 0x00000000, 0x00000e01, + 0x00000098, 0x00000001, 0x0000000b, 0x00000003, 0x00000001, 0x00000e01, 0x00000098, 0x00000002, + 0x0000000b, 0x00000003, 0x00000002, 0x00000e01, 0x00000098, 0x00000003, 0x0000000b, 0x00000003, + 0x00000003, 0x00000e01, 0x000000a6, 0x00000000, 0x0000000c, 0x00000003, 0x00000004, 0x00000e01, + 0x000000a6, 0x00000001, 0x0000000c, 0x00000003, 0x00000005, 0x00000e01, 0x545f5653, 0x46737365, + 0x6f746361, 0x56530072, 0x736e495f, 0x54656469, 0x46737365, 0x6f746361, 0xabab0072, 0x58454853, + 0x00000210, 0x00030050, 0x00000084, 0x01000071, 0x01002093, 0x01002094, 0x01001895, 0x01001096, + 0x01001897, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x01000072, 0x0200005f, + 0x00016000, 0x0400005f, 0x002010f2, 0x00000004, 0x00000000, 0x0400005f, 0x00201012, 0x00000004, + 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x00102012, 0x00000001, 0x03000065, + 0x00102012, 0x00000002, 0x02000068, 0x00000001, 0x04000036, 0x00100012, 0x00000000, 0x00016001, + 0x07000036, 0x001020f2, 0x00000000, 0x00a01e46, 0x0010000a, 0x00000000, 0x00000000, 0x07000036, + 0x00102012, 0x00000001, 0x00a0100a, 0x0010000a, 0x00000000, 0x00000001, 0x07000036, 0x00102012, + 0x00000002, 0x00a0100a, 0x0010000a, 0x00000000, 0x00000001, 0x0100003e, 0x01000073, 0x02000099, + 0x00000004, 0x0200005f, 0x00017000, 0x04000067, 0x00102012, 0x00000000, 0x0000000b, 0x04000067, + 0x00102012, 0x00000001, 0x0000000c, 0x04000067, 0x00102012, 0x00000002, 0x0000000d, 0x04000067, + 0x00102012, 0x00000003, 0x0000000e, 0x02000068, 0x00000001, 0x0400005b, 0x00102012, 0x00000000, + 0x00000004, 0x04000036, 0x00100012, 0x00000000, 0x0001700a, 0x07000036, 0x00902012, 0x0010000a, + 0x00000000, 0x0020803a, 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x02000099, 0x00000002, + 0x0200005f, 0x00017000, 0x04000067, 0x00102012, 0x00000004, 0x0000000f, 0x04000067, 0x00102012, + 0x00000005, 0x00000010, 0x02000068, 0x00000001, 0x0400005b, 0x00102012, 0x00000004, 0x00000002, + 0x04000036, 0x00100012, 0x00000000, 0x0001700a, 0x08000036, 0x00d02012, 0x00000004, 0x0010000a, + 0x00000000, 0x0020803a, 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)}; + static const DWORD ds_code[] = + { + 0x43425844, 0xc54dc020, 0x063a9622, 0x6f649eb9, 0xceb1dd36, 0x00000001, 0x0000054c, 0x00000004, + 0x00000030, 0x000000b4, 0x00000178, 0x000001fc, 0x4e475349, 0x0000007c, 0x00000003, 0x00000008, + 0x00000050, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x0000005c, 0x00000000, + 0x00000000, 0x00000003, 0x00000001, 0x00000101, 0x0000006a, 0x00000000, 0x00000002, 0x00000003, + 0x00000002, 0x00000101, 0x505f5653, 0x5449534f, 0x004e4f49, 0x50494c43, 0x5349445f, 0x434e4154, + 0x56530045, 0x696c435f, 0x73694470, 0x636e6174, 0xabab0065, 0x47534350, 0x000000bc, 0x00000006, + 0x00000008, 0x00000098, 0x00000000, 0x0000000b, 0x00000003, 0x00000000, 0x00000001, 0x00000098, + 0x00000001, 0x0000000b, 0x00000003, 0x00000001, 0x00000001, 0x00000098, 0x00000002, 0x0000000b, + 0x00000003, 0x00000002, 0x00000001, 0x00000098, 0x00000003, 0x0000000b, 0x00000003, 0x00000003, + 0x00000001, 0x000000a6, 0x00000000, 0x0000000c, 0x00000003, 0x00000004, 0x00000001, 0x000000a6, + 0x00000001, 0x0000000c, 0x00000003, 0x00000005, 0x00000001, 0x545f5653, 0x46737365, 0x6f746361, + 0x56530072, 0x736e495f, 0x54656469, 0x46737365, 0x6f746361, 0xabab0072, 0x4e47534f, 0x0000007c, + 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, + 0x0000005c, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000e01, 0x0000006a, 0x00000000, + 0x00000002, 0x00000003, 0x00000002, 0x00000e01, 0x505f5653, 0x5449534f, 0x004e4f49, 0x50494c43, + 0x5349445f, 0x434e4154, 0x56530045, 0x696c435f, 0x73694470, 0x636e6174, 0xabab0065, 0x58454853, + 0x00000348, 0x00040050, 0x000000d2, 0x01002093, 0x01001895, 0x0100086a, 0x04000059, 0x00208e46, + 0x00000000, 0x00000001, 0x0200005f, 0x0001c032, 0x0400005f, 0x002190f2, 0x00000004, 0x00000000, + 0x0400005f, 0x00219012, 0x00000004, 0x00000001, 0x0400005f, 0x00219012, 0x00000004, 0x00000002, + 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x00102012, 0x00000001, 0x04000067, + 0x00102012, 0x00000002, 0x00000002, 0x02000068, 0x00000002, 0x0a000000, 0x001000f2, 0x00000000, + 0x80219e46, 0x00000041, 0x00000002, 0x00000000, 0x00219e46, 0x00000003, 0x00000000, 0x09000032, + 0x001000f2, 0x00000000, 0x0001c006, 0x00100e46, 0x00000000, 0x00219e46, 0x00000002, 0x00000000, + 0x0a000000, 0x001000f2, 0x00000001, 0x80219e46, 0x00000041, 0x00000000, 0x00000000, 0x00219e46, + 0x00000001, 0x00000000, 0x09000032, 0x001000f2, 0x00000001, 0x0001c006, 0x00100e46, 0x00000001, + 0x00219e46, 0x00000000, 0x00000000, 0x08000000, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, + 0x80100e46, 0x00000041, 0x00000001, 0x08000032, 0x001020f2, 0x00000000, 0x0001c556, 0x00100e46, + 0x00000000, 0x00100e46, 0x00000001, 0x0a000000, 0x00100012, 0x00000000, 0x8021900a, 0x00000041, + 0x00000002, 0x00000001, 0x0021900a, 0x00000003, 0x00000001, 0x09000032, 0x00100012, 0x00000000, + 0x0001c00a, 0x0010000a, 0x00000000, 0x0021900a, 0x00000002, 0x00000001, 0x0a000000, 0x00100022, + 0x00000000, 0x8021900a, 0x00000041, 0x00000000, 0x00000001, 0x0021900a, 0x00000001, 0x00000001, + 0x09000032, 0x00100022, 0x00000000, 0x0001c00a, 0x0010001a, 0x00000000, 0x0021900a, 0x00000000, + 0x00000001, 0x08000000, 0x00100012, 0x00000000, 0x8010001a, 0x00000041, 0x00000000, 0x0010000a, + 0x00000000, 0x08000032, 0x00102012, 0x00000001, 0x0001c01a, 0x0010000a, 0x00000000, 0x0010001a, + 0x00000000, 0x0a000000, 0x00100012, 0x00000000, 0x8021900a, 0x00000041, 0x00000002, 0x00000002, + 0x0021900a, 0x00000003, 0x00000002, 0x09000032, 0x00100012, 0x00000000, 0x0001c00a, 0x0010000a, + 0x00000000, 0x0021900a, 0x00000002, 0x00000002, 0x0a000000, 0x00100022, 0x00000000, 0x8021900a, + 0x00000041, 0x00000000, 0x00000002, 0x0021900a, 0x00000001, 0x00000002, 0x09000032, 0x00100022, + 0x00000000, 0x0001c00a, 0x0010001a, 0x00000000, 0x0021900a, 0x00000000, 0x00000002, 0x08000000, + 0x00100012, 0x00000000, 0x8010001a, 0x00000041, 0x00000000, 0x0010000a, 0x00000000, 0x08000032, + 0x00100012, 0x00000000, 0x0001c01a, 0x0010000a, 0x00000000, 0x0010001a, 0x00000000, 0x0b000037, + 0x00102012, 0x00000002, 0x0020800a, 0x00000000, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, + 0x0010000a, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)}; static const DWORD gs_code[] = { #if 0 @@ -28845,7 +29030,7 @@ static void test_clip_distance(void) bool use_constant; float clip_distance0; float clip_distance1; - float padding; + float tessellation_factor; } cb_data; memset(&desc, 0, sizeof(desc)); @@ -28862,14 +29047,22 @@ static void test_clip_distance(void) root_parameters[0].Descriptor.ShaderRegister = 0; root_parameters[0].Descriptor.RegisterSpace = 0; root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_VERTEX; + root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV; - root_parameters[1].Descriptor.ShaderRegister = 1; + root_parameters[1].Descriptor.ShaderRegister = 0; root_parameters[1].Descriptor.RegisterSpace = 0; - root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_HULL; + root_parameters[2].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV; root_parameters[2].Descriptor.ShaderRegister = 0; root_parameters[2].Descriptor.RegisterSpace = 0; - root_parameters[2].ShaderVisibility = D3D12_SHADER_VISIBILITY_GEOMETRY; + root_parameters[2].ShaderVisibility = D3D12_SHADER_VISIBILITY_DOMAIN; + + root_parameters[3].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV; + root_parameters[3].Descriptor.ShaderRegister = 0; + root_parameters[3].Descriptor.RegisterSpace = 0; + root_parameters[3].ShaderVisibility = D3D12_SHADER_VISIBILITY_GEOMETRY; + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); root_signature_desc.pParameters = root_parameters; root_signature_desc.NumStaticSamplers = 0; @@ -28898,14 +29091,20 @@ static void test_clip_distance(void) vbv[1].SizeInBytes = sizeof(vertices); memset(&cb_data, 0, sizeof(cb_data)); + cb_data.tessellation_factor = 1.0f; vs_cb = create_upload_buffer(device, sizeof(cb_data), &cb_data); + tess_cb = create_upload_buffer(device, sizeof(cb_data), &cb_data); gs_cb = create_upload_buffer(device, sizeof(cb_data), &cb_data); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 1, + ID3D12Resource_GetGPUVirtualAddress(tess_cb)); ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(tess_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 3, ID3D12Resource_GetGPUVirtualAddress(gs_cb)); ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); @@ -28923,7 +29122,7 @@ static void test_clip_distance(void) reset_command_list(command_list, context.allocator); transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); - check_clip_distance(&context, pso, vbv, vb[1], vs_cb, gs_cb); + check_clip_distance(&context, pso, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP, vbv, vb[1], vs_cb, tess_cb, gs_cb); cb_data.use_constant = true; cb_data.clip_distance0 = -1.0f; @@ -28931,13 +29130,63 @@ static void test_clip_distance(void) ID3D12PipelineState_Release(pso); + /* tessellation shaders */ + pso_desc.HS = hs; + pso_desc.DS = ds; + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pso); + ok(hr == S_OK, "Failed to create pipeline state, hr %#x.\n", hr); + + check_clip_distance(&context, pso, D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST, + vbv, vb[1], vs_cb, tess_cb, gs_cb); + + cb_data.use_constant = false; + cb_data.tessellation_factor = 2.0f; + update_buffer_data(tess_cb, 0, sizeof(cb_data), &cb_data); + + for (i = 0; i < ARRAY_SIZE(vertices); ++i) + vertices[i].clip_distance0 = 1.0f; + update_buffer_data(vb[1], 0, sizeof(vertices), &vertices); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, + ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 1, + ID3D12Resource_GetGPUVirtualAddress(tess_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(tess_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 3, + ID3D12Resource_GetGPUVirtualAddress(gs_cb)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + ID3D12PipelineState_Release(pso); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + cb_data.use_constant = true; + cb_data.clip_distance0 = -1.0f; + update_buffer_data(tess_cb, 0, sizeof(cb_data), &cb_data); + /* geometry shader */ pso_desc.GS = gs; hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, &IID_ID3D12PipelineState, (void **)&pso); ok(hr == S_OK, "Failed to create pipeline state, hr %#x.\n", hr); - check_clip_distance(&context, pso, vbv, vb[1], vs_cb, gs_cb); + check_clip_distance(&context, pso, D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST, + vbv, vb[1], vs_cb, tess_cb, gs_cb); cb_data.use_constant = true; cb_data.clip_distance0 = 1.0f; @@ -28946,10 +29195,14 @@ static void test_clip_distance(void) ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 1, + ID3D12Resource_GetGPUVirtualAddress(tess_cb)); ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(tess_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 3, ID3D12Resource_GetGPUVirtualAddress(gs_cb)); ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); - ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); @@ -28966,7 +29219,10 @@ static void test_clip_distance(void) /* multiple clip distances */ pso_desc.VS = vs_multiple; + memset(&pso_desc.HS, 0, sizeof(pso_desc.HS)); + memset(&pso_desc.DS, 0, sizeof(pso_desc.DS)); memset(&pso_desc.GS, 0, sizeof(pso_desc.GS)); + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE; hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, &IID_ID3D12PipelineState, (void **)&pso); ok(hr == S_OK, "Failed to create pipeline state, hr %#x.\n", hr); @@ -28981,7 +29237,11 @@ static void test_clip_distance(void) ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 1, + ID3D12Resource_GetGPUVirtualAddress(tess_cb)); ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(tess_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 3, ID3D12Resource_GetGPUVirtualAddress(gs_cb)); ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); @@ -29008,7 +29268,11 @@ static void test_clip_distance(void) ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 1, + ID3D12Resource_GetGPUVirtualAddress(tess_cb)); ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(tess_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 3, ID3D12Resource_GetGPUVirtualAddress(gs_cb)); ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); @@ -29041,7 +29305,11 @@ static void test_clip_distance(void) ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 1, + ID3D12Resource_GetGPUVirtualAddress(tess_cb)); ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(tess_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 3, ID3D12Resource_GetGPUVirtualAddress(gs_cb)); ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); @@ -29058,6 +29326,7 @@ static void test_clip_distance(void) for (i = 0; i < ARRAY_SIZE(vb); ++i) ID3D12Resource_Release(vb[i]); ID3D12Resource_Release(vs_cb); + ID3D12Resource_Release(tess_cb); ID3D12Resource_Release(gs_cb); destroy_test_context(&context); } -- 2.11.0

1 0

[PATCH vkd3d 1/3] vkd3d-shader: Handle non-vec4 builtins in vkd3d_dxbc_compiler_emit_hull_shader_input_initialisation().
by Henri Verbeet Feb. 12, 2021

Feb. 12, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This is required by the next patch in this series. libs/vkd3d-shader/spirv.c | 49 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 106c2980..72bb61f1 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6268,16 +6268,18 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_barrier(struct vkd3d_dxbc_compi static void vkd3d_dxbc_compiler_emit_hull_shader_input_initialisation(struct vkd3d_dxbc_compiler *compiler) { + uint32_t type_id, length_id, register_index_id, src_array_id, dst_array_id, vicp_id, tmp_id; const struct vkd3d_shader_signature *signature = compiler->input_signature; + uint32_t src_type_id, dst_type_id, src_id, dst_id, point_index_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t type_id, length_id, index_id, src_id, dst_id, vicp_id; const struct vkd3d_shader_signature_element *element; enum vkd3d_shader_input_sysval_semantic sysval; const struct vkd3d_spirv_builtin *builtin; - unsigned int register_count, i; + unsigned int register_count, i, j; struct vkd3d_shader_register r; struct vkd3d_symbol symbol; struct rb_entry *entry; + uint32_t indices[2]; for (i = 0, register_count = 0; i < signature->element_count; ++i) { @@ -6303,26 +6305,51 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_input_initialisation(struct vkd entry = rb_get(&compiler->symbol_table, &symbol); vicp_id = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry)->id; - index_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, element->register_index); - dst_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, type_id, vicp_id, index_id); + register_index_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, element->register_index); + dst_array_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, type_id, vicp_id, register_index_id); if (element->sysval_semantic) { sysval = vkd3d_siv_from_sysval(element->sysval_semantic); builtin = get_spirv_builtin_for_sysval(compiler, sysval); - src_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, + src_array_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, SpvStorageClassInput, compiler->input_control_point_count); + + if (builtin->component_count == 4) + { + vkd3d_spirv_build_op_copy_memory(builder, dst_array_id, src_array_id, SpvMemoryAccessMaskNone); + } + else + { + tmp_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_FLOAT, builtin->component_count); + src_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassInput, tmp_id); + dst_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassPrivate, tmp_id); + + for (j = 0; j < compiler->input_control_point_count; ++j) + { + point_index_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, j); + src_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, + src_type_id, src_array_id, point_index_id); + + indices[0] = point_index_id; + indices[1] = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0); + dst_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, + dst_type_id, dst_array_id, indices, 2); + + vkd3d_spirv_build_op_copy_memory(builder, dst_id, src_id, SpvMemoryAccessMaskNone); + } + } } else { - src_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, + src_array_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, SpvStorageClassInput, VKD3D_SHADER_COMPONENT_FLOAT, 4, compiler->input_control_point_count); - vkd3d_spirv_add_iface_variable(builder, src_id); - vkd3d_spirv_build_op_decorate1(builder, src_id, SpvDecorationLocation, element->register_index); - vkd3d_spirv_build_op_name(builder, src_id, "v%u", element->register_index); - } + vkd3d_spirv_add_iface_variable(builder, src_array_id); + vkd3d_spirv_build_op_decorate1(builder, src_array_id, SpvDecorationLocation, element->register_index); + vkd3d_spirv_build_op_name(builder, src_array_id, "v%u", element->register_index); - vkd3d_spirv_build_op_copy_memory(builder, dst_id, src_id, SpvMemoryAccessMaskNone); + vkd3d_spirv_build_op_copy_memory(builder, dst_array_id, src_array_id, SpvMemoryAccessMaskNone); + } } } -- 2.11.0

1 0