February 2019 - Wine-Commits

Nikolay Sivov : xmllite/tests: Test complete writer output for UTF-16 case.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: wine Branch: master Commit: 9d4c73f4c1e96bf47b6ca2c5398e5c12c43bd8ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d4c73f4c1e96bf47b6ca2c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 13 10:47:46 2019 +0300 xmllite/tests: Test complete writer output for UTF-16 case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 1c6689a..13d67be 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -49,16 +49,18 @@ static void check_output_raw(IStream *stream, const void *expected, SIZE_T size, SIZE_T content_size; HGLOBAL hglobal; HRESULT hr; - char *ptr; + WCHAR *ptr; hr = GetHGlobalFromStream(stream, &hglobal); ok_(__FILE__, line)(hr == S_OK, "Failed to get the stream handle, hr %#x.\n", hr); content_size = GlobalSize(hglobal); - ok_(__FILE__, line)(size <= content_size, "Unexpected test output size.\n"); + ok_(__FILE__, line)(size == content_size, "Unexpected test output size %ld.\n", content_size); ptr = GlobalLock(hglobal); if (size <= content_size) ok_(__FILE__, line)(!memcmp(expected, ptr, size), "Unexpected output content.\n"); + if (size != content_size && *ptr == 0xfeff) + ok_(__FILE__, line)(0, "Content: %s.\n", wine_dbgstr_wn(ptr, content_size / sizeof(WCHAR))); GlobalUnlock(hglobal); } @@ -719,11 +721,14 @@ static void test_omitxmldeclaration(void) static void test_bom(void) { + static const WCHAR piW[] = {0xfeff,'<','?','x','m','l',' ','v','e','r','s','i','o','n','=','"','1','.','0','"','?','>'}; + static const WCHAR aopenW[] = {0xfeff,'<','a'}; + static const WCHAR afullW[] = {0xfeff,'<','a',' ','/','>'}; static const WCHAR versionW[] = {'v','e','r','s','i','o','n','=','"','1','.','0','"',0}; static const WCHAR utf16W[] = {'u','t','f','-','1','6',0}; static const WCHAR xmlW[] = {'x','m','l',0}; + static const WCHAR bomW[] = {0xfeff}; IXmlWriterOutput *output; - unsigned char *ptr; IXmlWriter *writer; IStream *stream; HGLOBAL hglobal; @@ -750,12 +755,7 @@ static void test_bom(void) hr = IXmlWriter_Flush(writer); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = GetHGlobalFromStream(stream, &hglobal); - ok(hr == S_OK, "got 0x%08x\n", hr); - - ptr = GlobalLock(hglobal); - ok(ptr[0] == 0xff && ptr[1] == 0xfe, "got %x,%x\n", ptr[0], ptr[1]); - GlobalUnlock(hglobal); + CHECK_OUTPUT_RAW(stream, bomW, sizeof(bomW)); IStream_Release(stream); IUnknown_Release(output); @@ -776,12 +776,7 @@ static void test_bom(void) hr = IXmlWriter_Flush(writer); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = GetHGlobalFromStream(stream, &hglobal); - ok(hr == S_OK, "got 0x%08x\n", hr); - - ptr = GlobalLock(hglobal); - ok(ptr[0] == 0xff && ptr[1] == 0xfe, "got %x,%x\n", ptr[0], ptr[1]); - GlobalUnlock(hglobal); + CHECK_OUTPUT_RAW(stream, piW, sizeof(piW)); IUnknown_Release(output); IStream_Release(stream); @@ -802,12 +797,7 @@ static void test_bom(void) hr = IXmlWriter_Flush(writer); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = GetHGlobalFromStream(stream, &hglobal); - ok(hr == S_OK, "got 0x%08x\n", hr); - - ptr = GlobalLock(hglobal); - ok(ptr[0] == 0xff && ptr[1] == 0xfe, "got %x,%x\n", ptr[0], ptr[1]); - GlobalUnlock(hglobal); + CHECK_OUTPUT_RAW(stream, aopenW, sizeof(aopenW)); IUnknown_Release(output); IStream_Release(stream); @@ -833,10 +823,7 @@ static void test_bom(void) hr = GetHGlobalFromStream(stream, &hglobal); ok(hr == S_OK, "got 0x%08x\n", hr); - ptr = GlobalLock(hglobal); - ok(ptr[0] == 0xff && ptr[1] == 0xfe && ptr[2] == '<', "Unexpected output: %#x,%#x,%#x\n", - ptr[0], ptr[1], ptr[2]); - GlobalUnlock(hglobal); + CHECK_OUTPUT_RAW(stream, afullW, sizeof(afullW)); IUnknown_Release(output); IStream_Release(stream);

1 0

Alexandre Julliard : ntdll/tests: Add tests for initial process parameters layout.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: wine Branch: master Commit: 12a9b6d4078951f4d0c2473378d6b4531b09106a URL: https://source.winehq.org/git/wine.git/?a=commit;h=12a9b6d4078951f4d0c24733… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 13 16:20:05 2019 +0100 ntdll/tests: Add tests for initial process parameters layout. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/env.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 67 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 0c864fb..4e2ef82 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -37,6 +37,8 @@ static NTSTATUS (WINAPI *pRtlCreateProcessParameters)(RTL_USER_PROCESS_PARAMETER const UNICODE_STRING*, const UNICODE_STRING*); static void (WINAPI *pRtlDestroyProcessParameters)(RTL_USER_PROCESS_PARAMETERS *); +static void *initial_env; + static WCHAR small_env[] = {'f','o','o','=','t','o','t','o',0, 'f','o','=','t','i','t','i',0, 'f','o','o','o','=','t','u','t','u',0, @@ -289,17 +291,21 @@ static WCHAR *get_params_string( RTL_USER_PROCESS_PARAMETERS *params, UNICODE_ST static UINT_PTR check_string_( int line, RTL_USER_PROCESS_PARAMETERS *params, UNICODE_STRING *str, const UNICODE_STRING *expect, UINT_PTR pos ) { - ok_(__FILE__,line)( str->Length == expect->Length, "wrong length %u/%u\n", - str->Length, expect->Length ); - ok_(__FILE__,line)( str->MaximumLength == expect->MaximumLength || - broken( str->MaximumLength == 1 && expect->MaximumLength == 2 ), /* winxp */ - "wrong maxlength %u/%u\n", str->MaximumLength, expect->MaximumLength ); + if (expect) + { + ok_(__FILE__,line)( str->Length == expect->Length, "wrong length %u/%u\n", + str->Length, expect->Length ); + ok_(__FILE__,line)( str->MaximumLength == expect->MaximumLength || + broken( str->MaximumLength == 1 && expect->MaximumLength == 2 ), /* winxp */ + "wrong maxlength %u/%u\n", str->MaximumLength, expect->MaximumLength ); + } if (!str->MaximumLength) { ok_(__FILE__,line)( str->Buffer == NULL, "buffer not null %p\n", str->Buffer ); return pos; } ok_(__FILE__,line)( (UINT_PTR)str->Buffer == ((pos + sizeof(void*) - 1) & ~(sizeof(void *) - 1)) || + (!expect && (UINT_PTR)str->Buffer == pos) || /* initial params are not aligned */ broken( (UINT_PTR)str->Buffer == ((pos + 3) & ~3) ), "wrong buffer %lx/%lx\n", (UINT_PTR)str->Buffer, pos ); if (str->Length < str->MaximumLength) @@ -453,12 +459,68 @@ static void test_process_params(void) } else ok( broken(TRUE), "environment not inside block\n" ); /* <= win2k3 */ pRtlDestroyProcessParameters( params ); + + /* also test the actual parameters of the current process */ + + ok( cur_params->Flags & PROCESS_PARAMS_FLAG_NORMALIZED, "current params not normalized\n" ); + if (VirtualQuery( cur_params, &info, sizeof(info) ) && info.AllocationBase == cur_params) + { + ok( broken(TRUE), "not a heap block %p\n", cur_params ); /* winxp */ + ok( cur_params->AllocationSize == info.RegionSize, + "wrong AllocationSize %x/%lx\n", cur_params->AllocationSize, info.RegionSize ); + } + else + { + size = HeapSize( GetProcessHeap(), 0, cur_params ); + ok( size != ~0UL, "not a heap block %p\n", cur_params ); + ok( cur_params->AllocationSize == cur_params->Size, + "wrong AllocationSize %x/%x\n", cur_params->AllocationSize, cur_params->Size ); + ok( cur_params->Size == size, "wrong Size %x/%lx\n", cur_params->Size, size ); + } + + /* CurrentDirectory points outside the params, and DllPath may be null */ + pos = (UINT_PTR)cur_params->DllPath.Buffer; + if (!pos) pos = (UINT_PTR)cur_params->ImagePathName.Buffer; + pos = check_string( cur_params, &cur_params->DllPath, NULL, pos ); + pos = check_string( cur_params, &cur_params->ImagePathName, NULL, pos ); + pos = check_string( cur_params, &cur_params->CommandLine, NULL, pos ); + pos = check_string( cur_params, &cur_params->WindowTitle, NULL, pos ); + pos = check_string( cur_params, &cur_params->Desktop, NULL, pos ); + pos = check_string( cur_params, &cur_params->ShellInfo, NULL, pos ); + pos = check_string( cur_params, &cur_params->RuntimeInfo, NULL, pos ); + /* environment may follow */ + str = (WCHAR *)pos; + if (pos - (UINT_PTR)cur_params < cur_params->Size) + { + while (*str) str += lstrlenW(str) + 1; + str++; + } + ok( (char *)str == (char *)cur_params + cur_params->Size, + "wrong end ptr %p/%p\n", str, (char *)cur_params + cur_params->Size ); + + /* initial environment is a separate block */ + + ok( (char *)initial_env < (char *)cur_params || (char *)initial_env >= (char *)cur_params + size, + "initial environment inside block %p / %p\n", cur_params, initial_env ); + + if (VirtualQuery( initial_env, &info, sizeof(info) ) && info.AllocationBase == initial_env) + { + todo_wine + ok( broken(TRUE), "env not a heap block %p / %p\n", cur_params, initial_env ); /* winxp */ + } + else + { + size = HeapSize( GetProcessHeap(), 0, initial_env ); + ok( size != ~0UL, "env is not a heap block %p / %p\n", cur_params, initial_env ); + } } START_TEST(env) { HMODULE mod = GetModuleHandleA("ntdll.dll"); + initial_env = NtCurrentTeb()->Peb->ProcessParameters->Environment; + pRtlMultiByteToUnicodeN = (void *)GetProcAddress(mod,"RtlMultiByteToUnicodeN"); pRtlCreateEnvironment = (void*)GetProcAddress(mod, "RtlCreateEnvironment"); pRtlDestroyEnvironment = (void*)GetProcAddress(mod, "RtlDestroyEnvironment");

1 0

Alexandre Julliard : ntdll: Recreate the process parameters structure once everything has been initialized.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: wine Branch: master Commit: a95d7f6c4fc17d5bb3b83ef6c7e307b1ce06d554 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a95d7f6c4fc17d5bb3b83ef6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 13 14:39:11 2019 +0100 ntdll: Recreate the process parameters structure once everything has been initialized. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/loader.c | 4 +--- dlls/ntdll/ntdll_misc.h | 1 + 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index d2b40bd..367d083 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -669,3 +669,44 @@ void init_user_process_params( SIZE_T data_size ) done: RtlFreeHeap( GetProcessHeap(), 0, info ); } + + +/*********************************************************************** + * update_user_process_params + * + * Rebuild the RTL_USER_PROCESS_PARAMETERS structure once we have initialized all the fields. + */ +void update_user_process_params( const UNICODE_STRING *image ) +{ + RTL_USER_PROCESS_PARAMETERS *params, *cur_params = NtCurrentTeb()->Peb->ProcessParameters; + UNICODE_STRING title = cur_params->WindowTitle; + WCHAR *env = cur_params->Environment; + + cur_params->Environment = NULL; /* avoid copying it */ + if (!title.Buffer) title = *image; + if (RtlCreateProcessParametersEx( &params, image, &cur_params->DllPath, NULL, + &cur_params->CommandLine, NULL, &title, &cur_params->Desktop, + &cur_params->ShellInfo, &cur_params->RuntimeInfo, + PROCESS_PARAMS_FLAG_NORMALIZED )) + return; + + params->DebugFlags = cur_params->DebugFlags; + params->ConsoleHandle = cur_params->ConsoleHandle; + params->ConsoleFlags = cur_params->ConsoleFlags; + params->hStdInput = cur_params->hStdInput; + params->hStdOutput = cur_params->hStdOutput; + params->hStdError = cur_params->hStdError; + params->dwX = cur_params->dwX; + params->dwY = cur_params->dwY; + params->dwXSize = cur_params->dwXSize; + params->dwYSize = cur_params->dwYSize; + params->dwXCountChars = cur_params->dwXCountChars; + params->dwYCountChars = cur_params->dwYCountChars; + params->dwFillAttribute = cur_params->dwFillAttribute; + params->dwFlags = cur_params->dwFlags; + params->wShowWindow = cur_params->wShowWindow; + params->Environment = env; + + RtlFreeHeap( GetProcessHeap(), 0, cur_params ); + NtCurrentTeb()->Peb->ProcessParameters = params; +} diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 56a6c2d..6becb44 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3398,9 +3398,7 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, } peb->LoaderLock = &loader_section; - peb->ProcessParameters->ImagePathName = wm->ldr.FullDllName; - if (!peb->ProcessParameters->WindowTitle.Buffer) - peb->ProcessParameters->WindowTitle = wm->ldr.FullDllName; + update_user_process_params( &wm->ldr.FullDllName ); version_init( wm->ldr.FullDllName.Buffer ); virtual_set_large_address_space(); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index bad7d96..5a93ede 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -81,6 +81,7 @@ extern void virtual_init_threading(void) DECLSPEC_HIDDEN; extern void fill_cpu_info(void) DECLSPEC_HIDDEN; extern void heap_set_debug_flags( HANDLE handle ) DECLSPEC_HIDDEN; extern void init_user_process_params( SIZE_T data_size ) DECLSPEC_HIDDEN; +extern void update_user_process_params( const UNICODE_STRING *image ) DECLSPEC_HIDDEN; /* server support */ extern timeout_t server_start_time DECLSPEC_HIDDEN;

1 0

Józef Kucia : vkd3d-shader: Implement relative addressing for arrayed registers.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: vkd3d Branch: master Commit: 7fde0ac78f3a666dff5cb7bf1451f006c258a7a2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7fde0ac78f3a666dff5cb7b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 12 17:41:32 2019 +0100 vkd3d-shader: Implement relative addressing for arrayed registers. 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 886dbb1..9833fd9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2589,12 +2589,12 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp } else { - if (reg->idx[0].rel_addr || reg->idx[1].rel_addr) + if (reg->idx[1].rel_addr) FIXME("Relative addressing not implemented.\n"); /* Handle arrayed registers, e.g. v[3][0]. */ if (reg->idx[1].offset != ~0u) - indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, reg->idx[0].offset); + indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[0]); } if (index_count)

1 0

Józef Kucia : vkd3d-shader: Implement input registers for control point phase.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: vkd3d Branch: master Commit: d30afc37c4b9c0e8382a4cc7610ca702b5d371d3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d30afc37c4b9c0e8382a4cc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 12 17:41:31 2019 +0100 vkd3d-shader: Implement input registers for control point phase. 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f873fab..886dbb1 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3641,6 +3641,9 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compil switch (reg->type) { + case VKD3DSPR_INPUT: + vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE); + return; case VKD3DSPR_OUTPOINTID: vkd3d_dxbc_compiler_emit_input_register(compiler, dst); return;

1 0

Józef Kucia : vkd3d-shader: Add basic support for vpc registers in domain shaders.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: vkd3d Branch: master Commit: efe68b00bbf1ea6c989042475523d2256ebff37a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=efe68b00bbf1ea6c9890424… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 12 17:41:30 2019 +0100 vkd3d-shader: Add basic support for vpc registers in domain shaders. 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 | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 44807e7..f873fab 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1985,6 +1985,7 @@ struct vkd3d_dxbc_compiler bool after_declarations_section; const struct vkd3d_shader_signature *input_signature; const struct vkd3d_shader_signature *output_signature; + const struct vkd3d_shader_signature *patch_constant_signature; const struct vkd3d_shader_transform_feedback_info *xfb_info; struct vkd3d_shader_output_info { @@ -2039,6 +2040,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader compiler->input_signature = &shader_desc->input_signature; compiler->output_signature = &shader_desc->output_signature; + compiler->patch_constant_signature = &shader_desc->patch_constant_signature; if (shader_interface) { @@ -2376,6 +2378,9 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_JOININSTID: snprintf(buffer, buffer_size, "vJoinInstanceId"); break; + case VKD3DSPR_PATCHCONST: + snprintf(buffer, buffer_size, "vpc%u", idx); + break; case VKD3DSPR_TESSCOORD: snprintf(buffer, buffer_size, "vDomainLocation"); break; @@ -3451,6 +3456,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi unsigned int component_idx, component_count, input_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; uint32_t type_id, ptr_type_id, float_type_id; const struct vkd3d_spirv_builtin *builtin; @@ -3478,7 +3484,10 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi reg_idx = reg->idx[0].offset; } - if (!(signature_element = vkd3d_find_signature_element_for_reg(compiler->input_signature, + shader_signature = reg->type == VKD3DSPR_PATCHCONST + ? compiler->patch_constant_signature : compiler->input_signature; + + if (!(signature_element = vkd3d_find_signature_element_for_reg(shader_signature, NULL, reg_idx, dst->write_mask))) { FIXME("No signature element for shader input, ignoring shader input.\n"); @@ -3507,7 +3516,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi use_private_var = builtin && builtin->fixup_pfn; if (input_component_count != VKD3D_VEC4_SIZE - && vkd3d_count_signature_elements_for_reg(compiler->input_signature, reg_idx) > 1) + && vkd3d_count_signature_elements_for_reg(shader_signature, reg_idx) > 1) { use_private_var = true; component_count = VKD3D_VEC4_SIZE; @@ -3529,6 +3538,9 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx); } + 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) @@ -4651,7 +4663,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_input(struct vkd3d_dxbc_compiler *compi if ((phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler))) vkd3d_dxbc_compiler_emit_shader_phase_input(compiler, phase, dst); - else if (vkd3d_shader_register_is_input(&dst->reg)) + else if (vkd3d_shader_register_is_input(&dst->reg) || dst->reg.type == VKD3DSPR_PATCHCONST) vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE); else vkd3d_dxbc_compiler_emit_input_register(compiler, dst);

1 0

Józef Kucia : vkd3d-shader: Implement user patch constants for hull shaders.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: vkd3d Branch: master Commit: b1b3405bcf3e9526f61116352dc23d2ec072388b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b1b3405bcf3e9526f611163… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 12 17:41:33 2019 +0100 vkd3d-shader: Implement user patch constants for hull shaders. 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 | 153 +++++++++++++++++++++++++--------------------- 1 file changed, 85 insertions(+), 68 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9833fd9..97963e9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3375,6 +3375,70 @@ static unsigned int vkd3d_count_signature_elements_for_reg( return count; } +static void vkd3d_dxbc_compiler_begin_shader_phase(struct vkd3d_dxbc_compiler *compiler, + struct vkd3d_shader_phase *phase) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t void_id, function_type_id; + unsigned int param_count; + uint32_t param_type_id; + const char *name; + + if (phase->instance_count) + { + param_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); + param_count = 1; + } + else + { + param_count = 0; + } + + phase->function_id = vkd3d_spirv_alloc_id(builder); + + void_id = vkd3d_spirv_get_op_type_void(builder); + function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, &param_type_id, param_count); + vkd3d_spirv_build_op_function(builder, void_id, phase->function_id, + SpvFunctionControlMaskNone, function_type_id); + + if (phase->instance_count) + phase->instance_id = vkd3d_spirv_build_op_function_parameter(builder, param_type_id); + + vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); + phase->function_location = vkd3d_spirv_stream_current_location(&builder->function_stream); + + switch (phase->type) + { + case VKD3DSIH_HS_CONTROL_POINT_PHASE: + name = "control"; + break; + case VKD3DSIH_HS_FORK_PHASE: + name = "fork"; + break; + case VKD3DSIH_HS_JOIN_PHASE: + name = "join"; + break; + default: + ERR("Invalid phase type %#x.\n", phase->type); + return; + } + vkd3d_spirv_build_op_name(builder, phase->function_id, "%s%u", name, phase->idx); +} + +static const struct vkd3d_shader_phase *vkd3d_dxbc_compiler_get_current_shader_phase( + struct vkd3d_dxbc_compiler *compiler) +{ + struct vkd3d_shader_phase *phase; + + if (!compiler->shader_phase_count) + return NULL; + + phase = &compiler->shader_phases[compiler->shader_phase_count - 1]; + if (!phase->function_id) + vkd3d_dxbc_compiler_begin_shader_phase(compiler, phase); + return phase; +} + static void vkd3d_dxbc_compiler_decorate_xfb_output(struct vkd3d_dxbc_compiler *compiler, uint32_t id, unsigned int component_count, const struct vkd3d_shader_signature_element *signature_element) { @@ -3806,17 +3870,25 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler 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; const struct vkd3d_spirv_builtin *builtin; enum vkd3d_component_type component_type; + const struct vkd3d_shader_phase *phase; struct vkd3d_symbol reg_symbol; SpvStorageClass storage_class; struct rb_entry *entry = NULL; unsigned int signature_idx; bool use_private_variable; + bool is_patch_constant; uint32_t id, var_id; - if (!(signature_element = vkd3d_find_signature_element_for_reg(compiler->output_signature, + phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler); + is_patch_constant = phase && (phase->type == VKD3DSIH_HS_FORK_PHASE || phase->type == VKD3DSIH_HS_JOIN_PHASE); + + shader_signature = is_patch_constant ? compiler->patch_constant_signature : compiler->output_signature; + + if (!(signature_element = vkd3d_find_signature_element_for_reg(shader_signature, &signature_idx, reg->idx[0].offset, dst->write_mask))) { FIXME("No signature element for shader output, ignoring shader output.\n"); @@ -3875,11 +3947,17 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationComponent, component_idx); } + if (is_patch_constant) + vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationPatch, NULL, 0); + vkd3d_dxbc_compiler_decorate_xfb_output(compiler, id, output_component_count, signature_element); } - compiler->output_info[signature_idx].id = id; - compiler->output_info[signature_idx].component_type = component_type; + if (!is_patch_constant) + { + 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 @@ -3905,7 +3983,10 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); } - if (use_private_variable) + if (use_private_variable && is_patch_constant) + FIXME("Private variables not supported for patch constants.\n"); + + if (use_private_variable && !is_patch_constant) { unsigned int idx = vkd3d_dxbc_compiler_get_output_variable_index(compiler, reg->idx[0].offset); compiler->private_output_variable[idx] = var_id; @@ -3996,70 +4077,6 @@ static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_comp vkd3d_dxbc_compiler_emit_shader_signature_outputs(compiler); } -static void vkd3d_dxbc_compiler_begin_shader_phase(struct vkd3d_dxbc_compiler *compiler, - struct vkd3d_shader_phase *phase) -{ - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t void_id, function_type_id; - unsigned int param_count; - uint32_t param_type_id; - const char *name; - - if (phase->instance_count) - { - param_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); - param_count = 1; - } - else - { - param_count = 0; - } - - phase->function_id = vkd3d_spirv_alloc_id(builder); - - void_id = vkd3d_spirv_get_op_type_void(builder); - function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, &param_type_id, param_count); - vkd3d_spirv_build_op_function(builder, void_id, phase->function_id, - SpvFunctionControlMaskNone, function_type_id); - - if (phase->instance_count) - phase->instance_id = vkd3d_spirv_build_op_function_parameter(builder, param_type_id); - - vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); - phase->function_location = vkd3d_spirv_stream_current_location(&builder->function_stream); - - switch (phase->type) - { - case VKD3DSIH_HS_CONTROL_POINT_PHASE: - name = "control"; - break; - case VKD3DSIH_HS_FORK_PHASE: - name = "fork"; - break; - case VKD3DSIH_HS_JOIN_PHASE: - name = "join"; - break; - default: - ERR("Invalid phase type %#x.\n", phase->type); - return; - } - vkd3d_spirv_build_op_name(builder, phase->function_id, "%s%u", name, phase->idx); -} - -static const struct vkd3d_shader_phase *vkd3d_dxbc_compiler_get_current_shader_phase( - struct vkd3d_dxbc_compiler *compiler) -{ - struct vkd3d_shader_phase *phase; - - if (!compiler->shader_phase_count) - return NULL; - - phase = &compiler->shader_phases[compiler->shader_phase_count - 1]; - if (!phase->function_id) - vkd3d_dxbc_compiler_begin_shader_phase(compiler, phase); - return phase; -} - static size_t vkd3d_dxbc_compiler_get_current_function_location(struct vkd3d_dxbc_compiler *compiler) { const struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;

1 0

Józef Kucia : vkd3d: Improve heuristic for selecting physical device.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: vkd3d Branch: master Commit: 269bb649d7ade5455c7d8903a3da43c9697f0bf0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=269bb649d7ade5455c7d890… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 12 17:41:28 2019 +0100 vkd3d: Improve heuristic for selecting physical device. 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/device.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5265ec9..b71d442 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -573,20 +573,19 @@ VkInstance vkd3d_instance_get_vk_instance(struct vkd3d_instance *instance) } static void vkd3d_trace_physical_device(VkPhysicalDevice device, + const VkPhysicalDeviceProperties *vk_device_properties, const struct vkd3d_vk_instance_procs *vk_procs) { VkPhysicalDeviceMemoryProperties memory_properties; - VkPhysicalDeviceProperties device_properties; VkQueueFamilyProperties *queue_properties; unsigned int i, j; uint32_t count; - VK_CALL(vkGetPhysicalDeviceProperties(device, &device_properties)); - TRACE("Device name: %s.\n", device_properties.deviceName); - TRACE("Vendor ID: %#x, Device ID: %#x.\n", device_properties.vendorID, device_properties.deviceID); - TRACE("Driver version: %#x.\n", device_properties.driverVersion); - TRACE("API version: %u.%u.%u.\n", VK_VERSION_MAJOR(device_properties.apiVersion), - VK_VERSION_MINOR(device_properties.apiVersion), VK_VERSION_PATCH(device_properties.apiVersion)); + TRACE("Device name: %s.\n", vk_device_properties->deviceName); + TRACE("Vendor ID: %#x, Device ID: %#x.\n", vk_device_properties->vendorID, vk_device_properties->deviceID); + TRACE("Driver version: %#x.\n", vk_device_properties->driverVersion); + TRACE("API version: %u.%u.%u.\n", VK_VERSION_MAJOR(vk_device_properties->apiVersion), + VK_VERSION_MINOR(vk_device_properties->apiVersion), VK_VERSION_PATCH(vk_device_properties->apiVersion)); VK_CALL(vkGetPhysicalDeviceQueueFamilyProperties(device, &count, NULL)); TRACE("Queue families [%u]:\n", count); @@ -1031,8 +1030,10 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, static HRESULT vkd3d_select_physical_device(struct vkd3d_instance *instance, VkPhysicalDevice *selected_device) { + VkPhysicalDevice dgpu_device = VK_NULL_HANDLE, igpu_device = VK_NULL_HANDLE; const struct vkd3d_vk_instance_procs *vk_procs = &instance->vk_procs; VkInstance vk_instance = instance->vk_instance; + VkPhysicalDeviceProperties device_properties; VkPhysicalDevice *physical_devices; uint32_t count; unsigned int i; @@ -1061,15 +1062,26 @@ static HRESULT vkd3d_select_physical_device(struct vkd3d_instance *instance, } for (i = 0; i < count; ++i) - vkd3d_trace_physical_device(physical_devices[i], vk_procs); + { + VK_CALL(vkGetPhysicalDeviceProperties(physical_devices[i], &device_properties)); + vkd3d_trace_physical_device(physical_devices[i], &device_properties, vk_procs); - if (count > 1) - FIXME("Multiple physical devices available, selecting the first one.\n"); + if (device_properties.deviceType == VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU && !dgpu_device) + dgpu_device = physical_devices[i]; + else if (device_properties.deviceType == VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU && !igpu_device) + igpu_device = physical_devices[i]; + } - *selected_device = physical_devices[0]; + *selected_device = dgpu_device ? dgpu_device : igpu_device; + if (!*selected_device) + *selected_device = physical_devices[0]; vkd3d_free(physical_devices); + VK_CALL(vkGetPhysicalDeviceProperties(*selected_device, &device_properties)); + TRACE("Using device: %s, %#x:%#x.\n", device_properties.deviceName, + device_properties.vendorID, device_properties.deviceID); + return S_OK; }

1 0

Józef Kucia : tests: Get rid of ID3D12Object_SetName( object, NULL).
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: vkd3d Branch: master Commit: 48ed937de38d1e08b07eefff63ddb9a555b5698b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=48ed937de38d1e08b07eeff… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 12 17:41:34 2019 +0100 tests: Get rid of ID3D12Object_SetName(object, NULL). It crashes on Windows. 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 | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 29f976d..b80cc7b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2996,9 +2996,6 @@ static void test_object_interface(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } - hr = ID3D12Object_SetName(object, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - hr = ID3D12Object_SetName(object, emptyW); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);

1 0

Józef Kucia : vkd3d-shader: Translate vOutputControlPointID register.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: vkd3d Branch: master Commit: 1a5f058f4a8b4aad3ad8f0acb16562554b73eca8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1a5f058f4a8b4aad3ad8f0a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 12 17:41:29 2019 +0100 vkd3d-shader: Translate vOutputControlPointID register. 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 849ebfb..44807e7 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2362,6 +2362,9 @@ 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: @@ -3626,6 +3629,9 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compil switch (reg->type) { + case VKD3DSPR_OUTPOINTID: + vkd3d_dxbc_compiler_emit_input_register(compiler, dst); + return; case VKD3DSPR_FORKINSTID: case VKD3DSPR_JOININSTID: val_id = phase->instance_id;

1 0