May 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : winecrt0: Reimplement __wine_rtl_unwind() as a proper asm function.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 351bd3306914066dc8c9219353eeef585bb3bf41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=351bd3306914066dc8c92193… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 13:27:38 2019 +0200 winecrt0: Reimplement __wine_rtl_unwind() as a proper asm function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/exception.c | 64 ++++++++++++++++++++++++++++------------------- include/wine/exception.h | 4 +-- 2 files changed, 40 insertions(+), 28 deletions(-) diff --git a/dlls/winecrt0/exception.c b/dlls/winecrt0/exception.c index 98132fa..d141d28 100644 --- a/dlls/winecrt0/exception.c +++ b/dlls/winecrt0/exception.c @@ -23,38 +23,50 @@ #include "wine/exception.h" #include "wine/asm.h" -#ifdef __x86_64__ -extern void __wine_unwind_trampoline(void); -/* we need an extra call to make sure the stack is correctly aligned */ -__ASM_GLOBAL_FUNC( __wine_unwind_trampoline, "callq *%rax" ); -#endif - -/* wrapper for RtlUnwind since it clobbers registers on Windows */ -void __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record, - void (*target)(void) ) -{ #if defined(__GNUC__) && defined(__i386__) - int dummy1, dummy2, dummy3, dummy4; - __asm__ __volatile__("pushl %%ebp\n\t" - "pushl %%ebx\n\t" - "pushl $0\n\t" - "pushl %3\n\t" - "pushl %2\n\t" - "pushl %1\n\t" - "call *%0\n\t" - "popl %%ebx\n\t" - "popl %%ebp" - : "=a" (dummy1), "=S" (dummy2), "=D" (dummy3), "=c" (dummy4) - : "0" (RtlUnwind), "1" (frame), "2" (target), "3" (record) - : "edx", "memory" ); -#elif defined(__x86_64__) - RtlUnwind( frame, __wine_unwind_trampoline, record, target ); + +__ASM_GLOBAL_FUNC( __wine_rtl_unwind, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "subl $8,%esp\n\t" + "pushl $0\n\t" /* retval */ + "pushl 12(%ebp)\n\t" /* record */ + "pushl 16(%ebp)\n\t" /* target */ + "pushl 8(%ebp)\n\t" /* frame */ + "call " __ASM_NAME("RtlUnwind") __ASM_STDCALL(16) "\n\t" + "call *16(%ebp)" ) + +#elif defined(__GNUC__) && defined(__x86_64__) + +__ASM_GLOBAL_FUNC( __wine_rtl_unwind, + "pushq %rbp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") + "movq %rsp,%rbp\n\t" + __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") + "subq $0x20,%rsp\n\t" + "movq %r8,%r9\n\t" /* retval = final target */ + "movq %rdx,%r8\n\t" /* record */ + "leaq __wine_unwind_trampoline(%rip),%rdx\n\t" /* target = trampoline */ + "call " __ASM_NAME("RtlUnwind") "\n" + "__wine_unwind_trampoline:\n\t" + /* we need an extra call to make sure the stack is correctly aligned */ + "callq *%rax" ) + #else + +void __cdecl __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record, + void (*target)(void) ) +{ RtlUnwind( frame, target, record, 0 ); -#endif for (;;) target(); } +#endif + static void DECLSPEC_NORETURN unwind_target(void) { __WINE_FRAME *wine_frame = (__WINE_FRAME *)__wine_get_frame(); diff --git a/include/wine/exception.h b/include/wine/exception.h index f30807e..f4e9166 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -98,8 +98,8 @@ static inline int sigsetjmp( sigjmp_buf buf, int sigs ) { return setjmp( buf ); static inline void siglongjmp( sigjmp_buf buf, int val ) { longjmp( buf, val ); } #endif -extern void __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record, - void (*target)(void) ) DECLSPEC_HIDDEN DECLSPEC_NORETURN; +extern void __cdecl __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record, + void (*target)(void) ) DECLSPEC_HIDDEN DECLSPEC_NORETURN; extern DWORD __wine_exception_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context,

1 0

Alexandre Julliard : winecrt0: Don' t build unneeded code for Windows platforms.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 3346132a0b83d4a46ffbcc4e6911ed21f8710be6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3346132a0b83d4a46ffbcc4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 13:52:31 2019 +0200 winecrt0: Don't build unneeded code for Windows platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/delay_load.c | 4 ++++ dlls/winecrt0/dll_entry.c | 4 ++++ dlls/winecrt0/drv_entry.c | 4 ++++ dlls/winecrt0/exe16_entry.c | 4 ++-- dlls/winecrt0/exe_entry.c | 4 ++++ dlls/winecrt0/exe_main.c | 4 ++++ dlls/winecrt0/exe_wentry.c | 4 ++++ dlls/winecrt0/exe_wmain.c | 4 ++++ dlls/winecrt0/init.c | 4 ++++ 9 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/winecrt0/delay_load.c b/dlls/winecrt0/delay_load.c index ac257ba..aab4079 100644 --- a/dlls/winecrt0/delay_load.c +++ b/dlls/winecrt0/delay_load.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -61,3 +63,5 @@ static void free_delay_imports(void) if (*descr->phmod) FreeLibrary( *descr->phmod ); } #endif + +#endif /* _WIN32 */ diff --git a/dlls/winecrt0/dll_entry.c b/dlls/winecrt0/dll_entry.c index 9bbe8c4..591aa07 100644 --- a/dlls/winecrt0/dll_entry.c +++ b/dlls/winecrt0/dll_entry.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -43,3 +45,5 @@ BOOL WINAPI DECLSPEC_HIDDEN __wine_spec_dll_entry( HINSTANCE inst, DWORD reason, return ret; } + +#endif /* _WIN32 */ diff --git a/dlls/winecrt0/drv_entry.c b/dlls/winecrt0/drv_entry.c index 32a87ee..4750168 100644 --- a/dlls/winecrt0/drv_entry.c +++ b/dlls/winecrt0/drv_entry.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winternl.h" @@ -35,3 +37,5 @@ NTSTATUS DECLSPEC_HIDDEN WINAPI __wine_spec_drv_entry( struct _DRIVER_OBJECT *ob return DriverEntry( obj, path ); /* there is no detach routine so we can't call destructors */ } + +#endif /* _WIN32 */ diff --git a/dlls/winecrt0/exe16_entry.c b/dlls/winecrt0/exe16_entry.c index 2599332..1e477bd 100644 --- a/dlls/winecrt0/exe16_entry.c +++ b/dlls/winecrt0/exe16_entry.c @@ -18,14 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if defined(__i386__) && !defined(_WIN32) + #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "wownt32.h" #include "wine/winbase16.h" -#ifdef __i386__ - extern WORD WINAPI WinMain16( HINSTANCE16 inst, HINSTANCE16 prev, LPSTR cmdline, WORD show ); void WINAPI DECLSPEC_HIDDEN __wine_spec_exe16_entry( CONTEXT *context ) diff --git a/dlls/winecrt0/exe_entry.c b/dlls/winecrt0/exe_entry.c index 4165651..60c11aa 100644 --- a/dlls/winecrt0/exe_entry.c +++ b/dlls/winecrt0/exe_entry.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -37,3 +39,5 @@ DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_entry( PEB *peb ) if (needs_init) _fini(); ExitProcess( ret ); } + +#endif /* _WIN32 */ diff --git a/dlls/winecrt0/exe_main.c b/dlls/winecrt0/exe_main.c index 89ffa7b..94a96d1 100644 --- a/dlls/winecrt0/exe_main.c +++ b/dlls/winecrt0/exe_main.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -48,3 +50,5 @@ int main( int argc, char *argv[] ) if (!(info.dwFlags & STARTF_USESHOWWINDOW)) info.wShowWindow = SW_SHOWNORMAL; return WinMain( GetModuleHandleA(0), 0, cmdline, info.wShowWindow ); } + +#endif /* _WIN32 */ diff --git a/dlls/winecrt0/exe_wentry.c b/dlls/winecrt0/exe_wentry.c index 11cff89..ed1bd20 100644 --- a/dlls/winecrt0/exe_wentry.c +++ b/dlls/winecrt0/exe_wentry.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -37,3 +39,5 @@ DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_wentry( PEB *peb ) if (needs_init) _fini(); ExitProcess( ret ); } + +#endif /* _WIN32 */ diff --git a/dlls/winecrt0/exe_wmain.c b/dlls/winecrt0/exe_wmain.c index ce685f8..d697e90 100644 --- a/dlls/winecrt0/exe_wmain.c +++ b/dlls/winecrt0/exe_wmain.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -50,3 +52,5 @@ int wmain( int argc, WCHAR *argv[] ) if (!(info.dwFlags & STARTF_USESHOWWINDOW)) info.wShowWindow = SW_SHOWNORMAL; return wWinMain( GetModuleHandleW(0), 0, cmdline, info.wShowWindow ); } + +#endif /* _WIN32 */ diff --git a/dlls/winecrt0/init.c b/dlls/winecrt0/init.c index 74eca43..bd9d9fc 100644 --- a/dlls/winecrt0/init.c +++ b/dlls/winecrt0/init.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -40,3 +42,5 @@ void DECLSPEC_HIDDEN __wine_spec_init_ctor(void) if (__wine_spec_init_state == NO_INIT_DONE) __wine_spec_init(); __wine_spec_init_state = CONSTRUCTORS_DONE; } + +#endif /* _WIN32 */

1 0

Alexandre Julliard : configure: Rename WINE_CROSSTEST to WINE_CROSS_PE.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: b8daf1f134c19df2295097191b753d234b77f990 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8daf1f134c19df229509719… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 13:54:17 2019 +0200 configure: Rename WINE_CROSSTEST to WINE_CROSS_PE. It's not used only in tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 6 +++--- include/config.h.in | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index b15803c..ac543f0 100755 --- a/configure +++ b/configure @@ -9755,7 +9755,7 @@ test -n "$CROSSCC" || CROSSCC="false" saved_CFLAGS=$CFLAGS CROSSCFLAGS=${CROSSCFLAGS:-"-g -O2"} - EXTRACROSSCFLAGS="-DWINE_CROSSTEST -Wall" + EXTRACROSSCFLAGS="-DWINE_CROSS_PE -Wall" CC="$CROSSCC" diff --git a/configure.ac b/configure.ac index 9dd300d..7509dc7 100644 --- a/configure.ac +++ b/configure.ac @@ -1026,7 +1026,7 @@ then ac_save_CC="$CC" saved_CFLAGS=$CFLAGS AC_SUBST(CROSSCFLAGS,${CROSSCFLAGS:-"-g -O2"}) - AC_SUBST(EXTRACROSSCFLAGS,"-DWINE_CROSSTEST -Wall") + AC_SUBST(EXTRACROSSCFLAGS,"-DWINE_CROSS_PE -Wall") CC="$CROSSCC" CFLAGS=$CROSSCFLAGS @@ -2715,8 +2715,8 @@ dnl **** Generate output files **** AH_TOP([#ifndef __WINE_CONFIG_H #define __WINE_CONFIG_H -#ifndef WINE_CROSSTEST]) -AH_BOTTOM([#endif /* WINE_CROSSTEST */ +#ifndef WINE_CROSS_PE]) +AH_BOTTOM([#endif /* WINE_CROSS_PE */ #endif /* __WINE_CONFIG_H */]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) diff --git a/include/config.h.in b/include/config.h.in index b172e0a..836008f 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -2,7 +2,7 @@ #ifndef __WINE_CONFIG_H #define __WINE_CONFIG_H -#ifndef WINE_CROSSTEST +#ifndef WINE_CROSS_PE /* Define to the file extension for executables. */ #undef EXEEXT @@ -1475,5 +1475,5 @@ #undef inline #endif -#endif /* WINE_CROSSTEST */ +#endif /* WINE_CROSS_PE */ #endif /* __WINE_CONFIG_H */

1 0

Józef Kucia : vkd3d-shader: Try to avoid private IO variables even harder.
by Alexandre Julliard 14 May '19

14 May '19

Module: vkd3d Branch: master Commit: 91820630cb49ef645ca6251f63ce2ff63e0c568d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=91820630cb49ef645ca6251… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 14 13:27:42 2019 +0200 vkd3d-shader: Try to avoid private IO variables even harder. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 111 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 86 insertions(+), 25 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f85db11..e308ef3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3784,17 +3784,63 @@ static uint32_t vkd3d_dxbc_compiler_emit_builtin_variable(struct vkd3d_dxbc_comp return id; } -static bool needs_private_io_variable(const struct vkd3d_shader_signature *signature, unsigned int reg_idx) +static bool vkd3d_write_mask_is_contiguous(unsigned int mask) { + unsigned int i, j; + + assert(mask); + for (i = 0, j = 0; i < VKD3D_VEC4_SIZE; ++i) + { + if (mask & (1u << i)) + ++j; + else if (j) + break; + } + + return vkd3d_write_mask_component_count(mask) == j; +} + +static bool needs_private_io_variable(const struct vkd3d_shader_signature *signature, + unsigned int reg_idx, const struct vkd3d_spirv_builtin *builtin, + unsigned int *component_count, unsigned int *out_write_mask) +{ + unsigned int write_mask = 0; + bool have_sysval = false; unsigned int i, count; - count = 0; - for (i = 0; i < signature->element_count; ++i) + if (*component_count == VKD3D_VEC4_SIZE) + return false; + + for (i = 0, count = 0; i < signature->element_count; ++i) { - if (signature->elements[i].register_index == reg_idx) - ++count; + const struct vkd3d_shader_signature_element *current = &signature->elements[i]; + + if (current->register_index != reg_idx) + continue; + + write_mask |= current->mask & 0xff; + ++count; + + if (current->sysval_semantic) + have_sysval = true; } - return count > 1; + + if (count == 1) + return false; + + if (builtin || have_sysval) + return true; + + if (!vkd3d_write_mask_is_contiguous(write_mask)) + { + FIXME("Write mask %#x is non-contiguous.\n", write_mask); + return true; + } + + assert(vkd3d_write_mask_component_count(write_mask) >= *component_count); + *component_count = vkd3d_write_mask_component_count(write_mask); + *out_write_mask = write_mask; + return false; } static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compiler, @@ -3865,9 +3911,11 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi } if ((use_private_var = builtin && builtin->fixup_pfn)) - write_mask = dst->write_mask; - - if (input_component_count != VKD3D_VEC4_SIZE && needs_private_io_variable(shader_signature, reg_idx)) + { + component_count = VKD3D_VEC4_SIZE; + write_mask = VKD3DSP_WRITEMASK_ALL; + } + else if (needs_private_io_variable(shader_signature, reg_idx, builtin, &input_component_count, &write_mask)) { use_private_var = true; component_count = VKD3D_VEC4_SIZE; @@ -3876,9 +3924,16 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi storage_class = SpvStorageClassInput; + vkd3d_symbol_make_register(&reg_symbol, reg); + if (builtin) { input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, storage_class, array_size); + entry = rb_get(&compiler->symbol_table, &reg_symbol); + } + else if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) + { + input_id = RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry)->id; } else { @@ -3895,18 +3950,17 @@ 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); - vkd3d_symbol_make_register(&reg_symbol, reg); - - if (!use_private_var) + if (entry || !use_private_var) { var_id = input_id; } - else if (!(entry = rb_get(&compiler->symbol_table, &reg_symbol))) + else { storage_class = SpvStorageClassPrivate; var_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, storage_class, VKD3D_TYPE_FLOAT, component_count, array_size); } + if (!entry) { vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, @@ -4159,11 +4213,11 @@ static void vkd3d_dxbc_compiler_emit_output_register(struct vkd3d_dxbc_compiler static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) { - unsigned int component_idx, component_count, output_component_count; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_signature_element *signature_element; const struct vkd3d_shader_signature *shader_signature; const struct vkd3d_shader_register *reg = &dst->reg; + unsigned int component_idx, output_component_count; const struct vkd3d_spirv_builtin *builtin; enum vkd3d_component_type component_type; const struct vkd3d_shader_phase *phase; @@ -4196,7 +4250,6 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler write_mask = signature_element->mask & 0xff; component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); - component_count = vkd3d_write_mask_component_count(dst->write_mask); output_component_count = vkd3d_write_mask_component_count(signature_element->mask & 0xff); if (builtin) { @@ -4208,25 +4261,34 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler { component_type = signature_element->component_type; } - assert(component_count <= output_component_count); storage_class = SpvStorageClassOutput; if ((use_private_variable = builtin && builtin->spirv_array_size)) write_mask = dst->write_mask; - - if ((component_count != VKD3D_VEC4_SIZE && needs_private_io_variable(shader_signature, signature_element->register_index)) - || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE) + else if (get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE + || needs_private_io_variable(shader_signature, signature_element->register_index, + builtin, &output_component_count, &write_mask)) { use_private_variable = true; write_mask = VKD3DSP_WRITEMASK_ALL; } + vkd3d_symbol_make_register(&reg_symbol, reg); + if (compiler->output_info[signature_idx].id) { id = compiler->output_info[signature_idx].id; - use_private_variable = true; - write_mask = VKD3DSP_WRITEMASK_ALL; + if (compiler->output_info[signature_idx].array_element_mask) + { + use_private_variable = true; + write_mask = VKD3DSP_WRITEMASK_ALL; + entry = rb_get(&compiler->symbol_table, &reg_symbol); + } + } + else if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) + { + id = RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry)->id; } else { @@ -4269,11 +4331,10 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler if (use_private_variable) storage_class = SpvStorageClassPrivate; - vkd3d_symbol_make_register(&reg_symbol, reg); - if (!use_private_variable) - var_id = id; - else if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) + if (entry) var_id = RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry)->id; + else if (!use_private_variable) + var_id = id; else var_id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, storage_class, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE);

1 0

Józef Kucia : tests: Test eval attribute instructions with packed inputs.
by Alexandre Julliard 14 May '19

14 May '19

Module: vkd3d Branch: master Commit: 49ba93066e5a3ca4ec5b8b77d080cf554ff8a58a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=49ba93066e5a3ca4ec5b8b7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 14 13:27:43 2019 +0200 tests: Test eval attribute instructions with packed inputs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 58 +++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 13 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 842939b..82264c0 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -27961,26 +27961,57 @@ static void test_shader_eval_attribute(void) 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps_eval_sample_index = {ps_eval_sample_index_code, sizeof(ps_eval_sample_index_code)}; + static const DWORD vs_eval_centroid_code[] = + { +#if 0 + void main(uint id : SV_VertexID, out float4 position : SV_Position, + out float2 attr : ATTR, out float2 attr2 : ATTR2, out centroid float2 ref : REF) + { + float2 coords = float2((id << 1) & 2, id & 2); + position = float4(coords * float2(2, -2) + float2(-1, 1), 0, 1); + attr = attr2 = ref = position.xy; + } +#endif + 0x43425844, 0xed41033d, 0xa2906698, 0x319dcb84, 0x41750935, 0x00000001, 0x00000240, 0x00000003, + 0x0000002c, 0x00000060, 0x000000e8, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000006, 0x00000001, 0x00000000, 0x00000101, 0x565f5653, 0x65747265, 0x00444978, + 0x4e47534f, 0x00000080, 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000074, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000c03, + 0x00000074, 0x00000002, 0x00000000, 0x00000003, 0x00000001, 0x0000030c, 0x00000079, 0x00000000, + 0x00000000, 0x00000003, 0x00000002, 0x00000c03, 0x505f5653, 0x7469736f, 0x006e6f69, 0x52545441, + 0x46455200, 0xababab00, 0x58454853, 0x00000150, 0x00010050, 0x00000054, 0x0100086a, 0x04000060, + 0x00101012, 0x00000000, 0x00000006, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065, + 0x00102032, 0x00000001, 0x03000065, 0x001020c2, 0x00000001, 0x03000065, 0x00102032, 0x00000002, + 0x02000068, 0x00000001, 0x0b00008c, 0x00100012, 0x00000000, 0x00004001, 0x00000001, 0x00004001, + 0x00000001, 0x0010100a, 0x00000000, 0x00004001, 0x00000000, 0x07000001, 0x00100042, 0x00000000, + 0x0010100a, 0x00000000, 0x00004001, 0x00000002, 0x05000056, 0x00100032, 0x00000000, 0x00100086, + 0x00000000, 0x0f000032, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x00004002, 0x40000000, + 0xc0000000, 0x00000000, 0x00000000, 0x00004002, 0xbf800000, 0x3f800000, 0x00000000, 0x00000000, + 0x05000036, 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x05000036, 0x001020f2, 0x00000001, + 0x00100446, 0x00000000, 0x05000036, 0x00102032, 0x00000002, 0x00100046, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs_eval_centroid = {vs_eval_centroid_code, sizeof(vs_eval_centroid_code)}; static const DWORD ps_eval_centroid_code[] = { #if 0 - float4 main(float4 p : SV_Position, float2 attr : ATTR, centroid float2 ref : REF) : SV_Target + float4 main(float4 p : SV_Position, float2 attr : ATTR, float2 attr2 : ATTR2, centroid float2 ref : REF) : SV_Target { return float4(EvaluateAttributeCentroid(attr) - ref, 0, 1); } #endif - 0x43425844, 0x77f3381c, 0x9cf9ef7c, 0xefc86041, 0x1ab6e047, 0x00000001, 0x00000168, 0x00000003, - 0x0000002c, 0x0000009c, 0x000000d0, 0x4e475349, 0x00000068, 0x00000003, 0x00000008, 0x00000050, - 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000005c, 0x00000000, 0x00000000, - 0x00000003, 0x00000001, 0x00000303, 0x00000061, 0x00000000, 0x00000000, 0x00000003, 0x00000002, - 0x00000303, 0x505f5653, 0x7469736f, 0x006e6f69, 0x52545441, 0x46455200, 0xababab00, 0x4e47534f, - 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, - 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000090, 0x00000050, 0x00000024, - 0x0100086a, 0x03001062, 0x00101032, 0x00000001, 0x03001862, 0x00101032, 0x00000002, 0x03000065, - 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x050000cd, 0x00100032, 0x00000000, 0x00101046, - 0x00000001, 0x08000000, 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x80101046, 0x00000041, - 0x00000002, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, - 0x3f800000, 0x0100003e, + 0x43425844, 0x8ec53803, 0xdfd9505b, 0x8d4ce8ad, 0xbbefe3d4, 0x00000001, 0x00000180, 0x00000003, + 0x0000002c, 0x000000b4, 0x000000e8, 0x4e475349, 0x00000080, 0x00000004, 0x00000008, 0x00000068, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000074, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000303, 0x00000074, 0x00000002, 0x00000000, 0x00000003, 0x00000001, + 0x0000000c, 0x00000079, 0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x00000303, 0x505f5653, + 0x7469736f, 0x006e6f69, 0x52545441, 0x46455200, 0xababab00, 0x4e47534f, 0x0000002c, 0x00000001, + 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, + 0x65677261, 0xabab0074, 0x58454853, 0x00000090, 0x00000050, 0x00000024, 0x0100086a, 0x03001062, + 0x00101032, 0x00000001, 0x03001862, 0x00101032, 0x00000002, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x050000cd, 0x00100032, 0x00000000, 0x00101046, 0x00000001, 0x08000000, + 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x80101046, 0x00000041, 0x00000002, 0x08000036, + 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps_eval_centroid = {ps_eval_centroid_code, sizeof(ps_eval_centroid_code)}; static const struct vec4 expected_vec4 = {0.0f, 0.0f, 0.0f, 1.0f}; @@ -28027,6 +28058,7 @@ static void test_shader_eval_attribute(void) D3D12_RESOURCE_STATE_RESOLVE_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); ID3D12PipelineState_Release(context.pipeline_state); + pso_desc.VS = vs_eval_centroid; pso_desc.PS = ps_eval_centroid; hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, &IID_ID3D12PipelineState, (void **)&context.pipeline_state);

1 0

Józef Kucia : tests: Remove test_incompletely_initialized_shader_outputs().
by Alexandre Julliard 14 May '19

14 May '19

Module: vkd3d Branch: master Commit: 206d370be4f982072c66488c7cc4bc6372b10d04 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=206d370be4f982072c66488… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 14 13:27:35 2019 +0200 tests: Remove test_incompletely_initialized_shader_outputs(). The test checks the content of uninitialized pixel shader outputs and it fails on Windows with Intel GPUs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 81 ----------------------------------------------------------- 1 file changed, 81 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 4e08636..842939b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9756,86 +9756,6 @@ static void test_shader_input_output_components(void) destroy_test_context(&context); } -static void test_incompletely_initialized_shader_outputs(void) -{ - static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; - ID3D12GraphicsCommandList *command_list; - struct test_context_desc desc; - struct test_context context; - ID3D12CommandQueue *queue; - unsigned int i; - - static const DWORD ps_code[] = - { -#if 0 - float3 color; - - void main(out float4 o : SV_Target) - { - o.xyz = color; - } -#endif - 0x43425844, 0xb5d86526, 0xc6c2455a, 0x8d02fe46, 0x5932818b, 0x00000001, 0x000000bc, 0x00000003, - 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, - 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, - 0x0000080f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000044, 0x00000050, 0x00000011, - 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x00102072, 0x00000000, - 0x06000036, 0x00102072, 0x00000000, 0x00208246, 0x00000000, 0x00000000, 0x0100003e, - }; - static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; - static struct - { - struct vec4 input; - struct vec4 output; - } - tests[] = - { - {{0.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f, 0.0f}}, - {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 0.0f}}, - {{1.0f, 2.0f, 3.0f, 4.0f}, {1.0f, 2.0f, 3.0f, 0.0f}}, - }; - - memset(&desc, 0, sizeof(desc)); - desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT; - desc.no_root_signature = true; - if (!init_test_context(&context, &desc)) - return; - command_list = context.list; - queue = context.queue; - - context.root_signature = create_32bit_constants_root_signature(context.device, - 0, 4, D3D12_SHADER_VISIBILITY_PIXEL); - context.pipeline_state = create_pipeline_state(context.device, - context.root_signature, desc.rt_format, NULL, &ps, NULL); - - for (i = 0; i < ARRAY_SIZE(tests); ++i) - { - vkd3d_test_set_context("Test %u", i); - - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); - - ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); - ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); - ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &tests[i].input, 0); - ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); - ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); - ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); - ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); - 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_vec4(context.render_target, 0, queue, command_list, &tests[i].output, 0); - - 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); - } - vkd3d_test_set_context(NULL); - - destroy_test_context(&context); -} - static void check_descriptor_range_(unsigned int line, const D3D12_DESCRIPTOR_RANGE *range, const D3D12_DESCRIPTOR_RANGE *expected_range) { @@ -29121,7 +29041,6 @@ START_TEST(d3d12) run_test(test_discard_instruction); run_test(test_shader_interstage_interface); run_test(test_shader_input_output_components); - run_test(test_incompletely_initialized_shader_outputs); run_test(test_root_signature_byte_code); run_test(test_cs_constant_buffer); run_test(test_constant_buffer_relative_addressing);

1 0

Józef Kucia : vkd3d-shader: Allow vPrim in hull shader phases.
by Alexandre Julliard 14 May '19

14 May '19

Module: vkd3d Branch: master Commit: 3b6a63425a1bd39ca9a30fc4bc42e438422ac5fc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3b6a63425a1bd39ca9a30fc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 14 13:27:36 2019 +0200 vkd3d-shader: Allow vPrim in hull shader phases. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index dc51644..f0b7c5b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3967,6 +3967,7 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compil vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE); return; case VKD3DSPR_OUTPOINTID: + case VKD3DSPR_PRIMID: vkd3d_dxbc_compiler_emit_input_register(compiler, dst); return; case VKD3DSPR_FORKINSTID:

1 0

Józef Kucia : vkd3d-shader: Avoid generating debug names for hull shader SPIR-V built-ins.
by Alexandre Julliard 14 May '19

14 May '19

Module: vkd3d Branch: master Commit: 1f8cde763a565c1c973f96edf14b6e98cd0e3b1e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1f8cde763a565c1c973f96e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 14 13:27:37 2019 +0200 vkd3d-shader: Avoid generating debug names for hull shader SPIR-V built-ins. SPIRV Tools disassembler generates pretty names for SPIR-V built-ins. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f0b7c5b..84fcb6a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2436,17 +2436,11 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_COLOROUT: snprintf(buffer, buffer_size, "o%u", idx); break; - case VKD3DSPR_OUTPOINTID: - snprintf(buffer, buffer_size, "vOutputControlPointID"); - break; case VKD3DSPR_DEPTHOUT: case VKD3DSPR_DEPTHOUTGE: case VKD3DSPR_DEPTHOUTLE: snprintf(buffer, buffer_size, "oDepth"); break; - case VKD3DSPR_PRIMID: - snprintf(buffer, buffer_size, "vPrim"); - break; case VKD3DSPR_FORKINSTID: snprintf(buffer, buffer_size, "vForkInstanceId"); break; @@ -2483,6 +2477,10 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_SAMPLEMASK: snprintf(buffer, buffer_size, "oMask"); break; + case VKD3DSPR_OUTPOINTID: + case VKD3DSPR_PRIMID: + /* SPIRV-Tools disassembler generates names for SPIR-V built-ins. */ + return false; default: FIXME("Unhandled register %#x.\n", reg->type); snprintf(buffer, buffer_size, "unrecognized_%#x", reg->type);

1 0

Józef Kucia : vkd3d-shader: Try harder to avoid private variables for shader outputs.
by Alexandre Julliard 14 May '19

14 May '19

Module: vkd3d Branch: master Commit: f650b2f6ac2f5372d45e6e58f263d02b2cfe2127 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f650b2f6ac2f5372d45e6e5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 14 13:27:38 2019 +0200 vkd3d-shader: Try harder to avoid private variables for shader outputs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 51 ++++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 84fcb6a..e3adc5a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3600,20 +3600,6 @@ static const struct vkd3d_shader_signature_element *vkd3d_find_signature_element return NULL; } -static unsigned int vkd3d_count_signature_elements_for_reg( - const struct vkd3d_shader_signature *signature, unsigned int reg_idx) -{ - unsigned int i, count; - - count = 0; - for (i = 0; i < signature->element_count; ++i) - { - if (signature->elements[i].register_index == reg_idx) - ++count; - } - return count; -} - static void vkd3d_dxbc_compiler_emit_shader_phase_name(struct vkd3d_dxbc_compiler *compiler, uint32_t id, const struct vkd3d_shader_phase *phase, const char *suffix) { @@ -3768,6 +3754,19 @@ static uint32_t vkd3d_dxbc_compiler_emit_builtin_variable(struct vkd3d_dxbc_comp return id; } +static bool needs_private_io_variable(const struct vkd3d_shader_signature *signature, unsigned int reg_idx) +{ + unsigned int i, count; + + count = 0; + for (i = 0; i < signature->element_count; ++i) + { + if (signature->elements[i].register_index == reg_idx) + ++count; + } + return count > 1; +} + static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) { @@ -3836,8 +3835,8 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi if ((use_private_var = builtin && builtin->fixup_pfn)) write_mask = dst->write_mask; - if (input_component_count != VKD3D_VEC4_SIZE - && vkd3d_count_signature_elements_for_reg(shader_signature, reg_idx) > 1) + + if (input_component_count != VKD3D_VEC4_SIZE && needs_private_io_variable(shader_signature, reg_idx)) { use_private_var = true; component_count = VKD3D_VEC4_SIZE; @@ -4140,6 +4139,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler struct rb_entry *entry = NULL; unsigned int signature_idx; bool use_private_variable; + unsigned int write_mask; unsigned int array_size; bool is_patch_constant; uint32_t id, var_id; @@ -4160,6 +4160,8 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler builtin = vkd3d_get_spirv_builtin(compiler, dst->reg.type, sysval); + write_mask = signature_element->mask & 0xff; + component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); component_count = vkd3d_write_mask_component_count(dst->write_mask); output_component_count = vkd3d_write_mask_component_count(signature_element->mask & 0xff); @@ -4177,9 +4179,21 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler storage_class = SpvStorageClassOutput; + if ((use_private_variable = builtin && builtin->spirv_array_size)) + write_mask = dst->write_mask; + + if ((component_count != VKD3D_VEC4_SIZE && needs_private_io_variable(shader_signature, signature_element->register_index)) + || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE) + { + use_private_variable = true; + write_mask = VKD3DSP_WRITEMASK_ALL; + } + if (compiler->output_info[signature_idx].id) { id = compiler->output_info[signature_idx].id; + use_private_variable = true; + write_mask = VKD3DSP_WRITEMASK_ALL; } else { @@ -4219,9 +4233,6 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler compiler->output_info[signature_idx].id = id; compiler->output_info[signature_idx].component_type = component_type; - use_private_variable = component_count != VKD3D_VEC4_SIZE - || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE - || (builtin && builtin->spirv_array_size); if (use_private_variable) storage_class = SpvStorageClassPrivate; @@ -4236,7 +4247,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler if (!entry) { vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, - use_private_variable ? VKD3D_TYPE_FLOAT : component_type, VKD3DSP_WRITEMASK_ALL); + use_private_variable ? VKD3D_TYPE_FLOAT : component_type, write_mask); reg_symbol.info.reg.is_aggregate = use_private_variable ? false : array_size; if (!use_private_variable && is_control_point_phase(phase)) {

1 0

Józef Kucia : vkd3d-shader: Do not assume destination is 4 component vector in vkd3d_dxbc_compiler_emit_store ().
by Alexandre Julliard 14 May '19

14 May '19

Module: vkd3d Branch: master Commit: 68a4b89d6160c97ac2acc0e502f9524f6b115cc8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=68a4b89d6160c97ac2acc0e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 14 13:27:39 2019 +0200 vkd3d-shader: Do not assume destination is 4 component vector in vkd3d_dxbc_compiler_emit_store(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e3adc5a..18e10ad 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3179,7 +3179,7 @@ static void vkd3d_dxbc_compiler_emit_store(struct vkd3d_dxbc_compiler *compiler, for (i = 0, component_idx = 0; i < dst_component_count; ++i) { if (write_mask & (VKD3DSP_WRITEMASK_0 << i)) - components[i] = VKD3D_VEC4_SIZE + component_idx++; + components[i] = dst_component_count + component_idx++; else components[i] = i; }

1 0