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

Alexandre Julliard : winebuild: Store wine_ldt_copy pointer in the NE header at load time.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 7b494f13e7e36afd994fa2e67e07fafe660b3ec0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b494f13e7e36afd994fa2e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 16:46:00 2019 +0200 winebuild: Store wine_ldt_copy pointer in the NE header at load time. Avoids having to import libwine from 16-bit modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/ne_module.c | 1 + tools/winebuild/relay.c | 8 +++----- tools/winebuild/spec16.c | 9 +++------ 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 76ef355..357a0e9 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -921,6 +921,7 @@ static HMODULE16 NE_DoLoadBuiltinModule( const IMAGE_DOS_HEADER *mz_header, cons } patch_code_segment( pModule ); + *(void **)mz_header->e_res2 = &wine_ldt_copy; return hInstance; } diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 8718346..3b1f4cd 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -156,12 +156,10 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) output( "\tandl $0xfff8, %%edx\n" ); output( "\tshrl $1, %%edx\n" ); if (UsePIC) - { - output( "\taddl wine_ldt_copy_ptr-1b(%%ecx),%%edx\n" ); - output( "\tmovl (%%edx), %%edx\n" ); - } + output( "\taddl .Lwine_ldt_copy_ptr-1b(%%ecx),%%edx\n" ); else - output( "\tmovl %s(%%edx), %%edx\n", asm_name("wine_ldt_copy") ); + output( "\taddl .Lwine_ldt_copy_ptr,%%edx\n" ); + output( "\tmovl (%%edx), %%edx\n" ); output( "\tmovzwl %%sp, %%ebp\n" ); output( "\tleal %d(%%ebp,%%edx), %%edx\n", reg_func ? 0 : -4 ); diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index 027580b..9dce748 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -355,11 +355,11 @@ static void output_call16_function( ORDDEF *odp ) if (UsePIC) { output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); - output( "1:\tmovl wine_ldt_copy_ptr-1b(%%eax),%%esi\n" ); + output( "1:\tmovl .Lwine_ldt_copy_ptr-1b(%%eax),%%esi\n" ); needs_get_pc_thunk = 1; } else - output( "\tmovl $%s,%%esi\n", asm_name("wine_ldt_copy") ); + output( "\tmovl .Lwine_ldt_copy_ptr,%%esi\n" ); } /* preserve 16-byte stack alignment */ @@ -584,7 +584,7 @@ static void output_module16( DLLSPEC *spec ) output( "\t.short 0,0,0,0\n" ); /* e_res */ output( "\t.short 0\n" ); /* e_oemid */ output( "\t.short 0\n" ); /* e_oeminfo */ - output( "\t.short 0,0,0,0,0,0,0,0,0,0\n" ); /* e_res2 */ + output( ".Lwine_ldt_copy_ptr:\t.long 0,0,0,0,0\n" ); /* e_res2, used for ldt_copy */ output( "\t.long .L__wine_spec_ne_header-.L__wine_spec_dos_header\n" );/* e_lfanew */ output( ".L__wine_spec_ne_header:\n" ); @@ -794,9 +794,6 @@ static void output_module16( DLLSPEC *spec ) output( "\n/* relay functions */\n\n" ); output( "\t.text\n" ); for ( i = 0; i < nb_funcs; i++ ) output_call16_function( typelist[i] ); - output( "\t.data\n" ); - output( "wine_ldt_copy_ptr:\n" ); - output( "\t.long %s\n", asm_name("wine_ldt_copy") ); } free( typelist );

1 0

Alexandre Julliard : include: Don't allow using wine/ library.h with msvcrt.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: a23c20eee1c6570847081c31c139396468f69310 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a23c20eee1c6570847081c31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 16:46:47 2019 +0200 include: Don't allow using wine/library.h with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/kernel16_private.h | 1 + dlls/toolhelp.dll16/toolhelp.c | 1 + dlls/user.exe16/message.c | 1 + include/wine/library.h | 4 ++++ include/wine/winbase16.h | 1 - programs/winevdm/winevdm.c | 1 + 6 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/kernel16_private.h b/dlls/krnl386.exe16/kernel16_private.h index 1fb4968..284b063 100644 --- a/dlls/krnl386.exe16/kernel16_private.h +++ b/dlls/krnl386.exe16/kernel16_private.h @@ -25,6 +25,7 @@ #include "winreg.h" #include "winternl.h" #include "wine/asm.h" +#include "wine/library.h" #include "pshpack1.h" diff --git a/dlls/toolhelp.dll16/toolhelp.c b/dlls/toolhelp.dll16/toolhelp.c index cf5e6ef..47c2d2d 100644 --- a/dlls/toolhelp.dll16/toolhelp.c +++ b/dlls/toolhelp.dll16/toolhelp.c @@ -36,6 +36,7 @@ #include "wine/winbase16.h" #include "toolhelp.h" +#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(toolhelp); diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 290f36b..c0b60ad 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -30,6 +30,7 @@ #include "winerror.h" #include "dde.h" #include "user_private.h" +#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msg); diff --git a/include/wine/library.h b/include/wine/library.h index 242bb69..af9deaf 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -31,6 +31,10 @@ #error This file should not be used in Wine tests #endif +#ifdef __WINE_USE_MSVCRT +#error This file should not be used with msvcrt headers +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index 16c6324..d4a5096 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -24,7 +24,6 @@ #include <winbase.h> #include <winnls.h> #include <wine/windef16.h> -#include <wine/library.h> #include <pshpack1.h> diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index ccf6c8b..bde85a7 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -31,6 +31,7 @@ #include "winuser.h" #include "wincon.h" #include "wine/unicode.h" +#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winevdm);

1 0

Philip Rebohle : d3dcompiler: Accept a stat chunk size of 28 for reflection.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: b1f9cd57be74c52ab0d56cbaf47065d8f560827c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1f9cd57be74c52ab0d56cba… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Thu May 16 17:05:59 2019 +0200 d3dcompiler: Accept a stat chunk size of 28 for reflection. Fixes "unhandled size" error for Crysis shaders. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 24190f6..7c67c92 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1127,7 +1127,12 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c read_dword(&ptr, &r->gs_max_output_vertex_count); TRACE("GSMaxOutputVertexCount: %u\n", r->gs_max_output_vertex_count); - skip_dword_unknown(&ptr, 3); + skip_dword_unknown(&ptr, 2); + + /* old dx10 stat size */ + if (size == 28) return S_OK; + + skip_dword_unknown(&ptr, 1); /* dx10 stat size */ if (size == 29) return S_OK;

1 0

Dmitry Timoshkov : urlmon: Add support for PARSE_UNESCAPE to CoInternetParseUrl.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 422b625c9b31763e1542bbc1947c13bc5609ceda URL: https://source.winehq.org/git/wine.git/?a=commit;h=422b625c9b31763e1542bbc1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 17 15:04:16 2019 +0800 urlmon: Add support for PARSE_UNESCAPE to CoInternetParseUrl. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/internet.c | 7 ++++--- dlls/urlmon/tests/misc.c | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index 7c997a0..da4fa9a 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -218,7 +218,7 @@ static HRESULT parse_security_url(LPCWSTR url, DWORD flags, LPWSTR result, DWORD return E_FAIL; } -static HRESULT parse_encode(LPCWSTR url, DWORD flags, LPWSTR result, DWORD size, DWORD *rsize) +static HRESULT parse_encode(LPCWSTR url, PARSEACTION action, DWORD flags, LPWSTR result, DWORD size, DWORD *rsize) { IInternetProtocolInfo *protocol_info; DWORD prsize; @@ -229,7 +229,7 @@ static HRESULT parse_encode(LPCWSTR url, DWORD flags, LPWSTR result, DWORD size, protocol_info = get_protocol_info(url); if(protocol_info) { - hres = IInternetProtocolInfo_ParseUrl(protocol_info, url, PARSE_ENCODE, + hres = IInternetProtocolInfo_ParseUrl(protocol_info, url, action, flags, result, size, rsize, 0); IInternetProtocolInfo_Release(protocol_info); if(SUCCEEDED(hres)) @@ -401,7 +401,8 @@ HRESULT WINAPI CoInternetParseUrl(LPCWSTR pwzUrl, PARSEACTION ParseAction, DWORD case PARSE_SECURITY_URL: return parse_security_url(pwzUrl, dwFlags, pszResult, cchResult, pcchResult); case PARSE_ENCODE: - return parse_encode(pwzUrl, dwFlags, pszResult, cchResult, pcchResult); + case PARSE_UNESCAPE: + return parse_encode(pwzUrl, ParseAction, dwFlags, pszResult, cchResult, pcchResult); case PARSE_PATH_FROM_URL: return parse_path_from_url(pwzUrl, dwFlags, pszResult, cchResult, pcchResult); case PARSE_SCHEMA: diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index de0c654..6f4da47 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -62,6 +62,7 @@ DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xA DEFINE_EXPECT(ParseUrl); DEFINE_EXPECT(ParseUrl_ENCODE); +DEFINE_EXPECT(ParseUrl_UNESCAPE); DEFINE_EXPECT(QI_IInternetProtocolInfo); DEFINE_EXPECT(CreateInstance); DEFINE_EXPECT(unk_Release); @@ -383,6 +384,13 @@ static void test_CoInternetParseUrl(void) ok(!lstrcmpW(parse_tests[i].encoded_url, buf), "[%d] wrong encoded url\n", i); memset(buf, 0xf0, sizeof(buf)); + hres = pCoInternetParseUrl(parse_tests[i].url, PARSE_UNESCAPE, 0, buf, + ARRAY_SIZE(buf), &size, 0); + ok(hres == S_OK, "[%d] encoding failed: %08x\n", i, hres); + ok(size == lstrlenW(parse_tests[i].encoded_url), "[%d] wrong size\n", i); + ok(!lstrcmpW(parse_tests[i].encoded_url, buf), "[%d] wrong encoded url\n", i); + + memset(buf, 0xf0, sizeof(buf)); hres = pCoInternetParseUrl(parse_tests[i].url, PARSE_PATH_FROM_URL, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == parse_tests[i].path_hres, "[%d] path failed: %08x, expected %08x\n", @@ -890,6 +898,11 @@ static HRESULT WINAPI InternetProtocolInfo_ParseUrl(IInternetProtocolInfo *iface case PARSE_ENCODE: CHECK_EXPECT2(ParseUrl_ENCODE); break; + + case PARSE_UNESCAPE: + CHECK_EXPECT2(ParseUrl_UNESCAPE); + break; + default: CHECK_EXPECT2(ParseUrl); break; @@ -1056,6 +1069,16 @@ static void test_NameSpace(void) CHECK_CALLED(QI_IInternetProtocolInfo); CHECK_CALLED(ParseUrl_ENCODE); + qiret = S_OK; + SET_EXPECT(QI_IInternetProtocolInfo); + SET_EXPECT(ParseUrl_UNESCAPE); + + hres = pCoInternetParseUrl(url8, PARSE_UNESCAPE, 0, buf, ARRAY_SIZE(buf), &size, 0); + ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); + + CHECK_CALLED(QI_IInternetProtocolInfo); + CHECK_CALLED(ParseUrl_UNESCAPE); + SET_EXPECT(QI_IInternetProtocolInfo); SET_EXPECT(ParseUrl);

1 0

Alexandre Julliard : cabarc: Remove duplicate defines.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 92e50f57574d61a434aaff4c85163e2deec01ad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92e50f57574d61a434aaff4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 22:55:01 2019 +0200 cabarc: Remove duplicate defines. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cabarc/cabarc.c | 40 +++------------------------------------- 1 file changed, 3 insertions(+), 37 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index 7050d8c..66630db 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -20,6 +20,9 @@ #include <stdio.h> #include <stdlib.h> +#include <fcntl.h> +#include <io.h> +#include <share.h> #define WIN32_LEAN_AND_MEAN #include "windows.h" @@ -30,43 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cabarc); -/* from msvcrt */ -#ifndef _O_RDONLY -#define _O_RDONLY 0 -#define _O_WRONLY 1 -#define _O_RDWR 2 -#define _O_APPEND 0x0008 -#define _O_RANDOM 0x0010 -#define _O_SEQUENTIAL 0x0020 -#define _O_TEMPORARY 0x0040 -#define _O_NOINHERIT 0x0080 -#define _O_CREAT 0x0100 -#define _O_TRUNC 0x0200 -#define _O_EXCL 0x0400 -#define _O_SHORT_LIVED 0x1000 -#define _O_TEXT 0x4000 -#define _O_BINARY 0x8000 -#endif - -#ifndef _O_ACCMODE -#define _O_ACCMODE (_O_RDONLY|_O_WRONLY|_O_RDWR) -#endif - -#ifndef _SH_COMPAT -#define _SH_COMPAT 0x00 -#define _SH_DENYRW 0x10 -#define _SH_DENYWR 0x20 -#define _SH_DENYRD 0x30 -#define _SH_DENYNO 0x40 -#endif - -#ifndef _A_RDONLY -#define _A_RDONLY 0x01 -#define _A_HIDDEN 0x02 -#define _A_SYSTEM 0x04 -#define _A_ARCH 0x20 -#endif - /* command-line options */ static int opt_cabinet_size = CB_MAX_DISK; static int opt_cabinet_id;

1 0

Józef Kucia : vkd3d: Disable unncessary depth tests.
by Alexandre Julliard 17 May '19

17 May '19

Module: vkd3d Branch: master Commit: f629cdecc1b41e2d7bd38e76e05270530acfdfcb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f629cdecc1b41e2d7bd38e7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 17 10:39:12 2019 +0200 vkd3d: Disable unncessary depth tests. Allows us to create the render pass while creating the pipeline state. 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/state.c | 13 ++++++++++--- tests/d3d12.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index b3348d6..7bce614 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2228,8 +2228,17 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->rtv_formats[i] = VK_FORMAT_UNDEFINED; graphics->rt_count = rt_count; + ds_desc_from_d3d12(&graphics->ds_desc, &desc->DepthStencilState); + if (desc->DSVFormat == DXGI_FORMAT_UNKNOWN + && graphics->ds_desc.depthTestEnable && !graphics->ds_desc.depthWriteEnable + && graphics->ds_desc.depthCompareOp == VK_COMPARE_OP_ALWAYS && !graphics->ds_desc.stencilTestEnable) + { + TRACE("Disabling depth test.\n"); + graphics->ds_desc.depthTestEnable = VK_FALSE; + } + graphics->dsv_format = VK_FORMAT_UNDEFINED; - if (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable) + if (graphics->ds_desc.depthTestEnable || graphics->ds_desc.stencilTestEnable) { if (desc->DSVFormat == DXGI_FORMAT_UNKNOWN) { @@ -2545,8 +2554,6 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->ms_desc.alphaToCoverageEnable = desc->BlendState.AlphaToCoverageEnable; graphics->ms_desc.alphaToOneEnable = VK_FALSE; - ds_desc_from_d3d12(&graphics->ds_desc, &desc->DepthStencilState); - if (graphics->dsv_format == VK_FORMAT_UNDEFINED) graphics->render_pass = VK_NULL_HANDLE; else if (FAILED(hr = d3d12_graphics_pipeline_state_create_render_pass(graphics, diff --git a/tests/d3d12.c b/tests/d3d12.c index 36bc41c..c7dfd8a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4963,6 +4963,39 @@ static void test_unknown_dsv_format(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_vec4(context.render_target, 0, queue, command_list, &green, 0); + /* DSVFormat = DXGI_FORMAT_UNKNOWN and D3D12_COMPARISON_FUNC_ALWAYS */ + ID3D12PipelineState_Release(context.pipeline_state); + pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_ALWAYS; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); + + 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); + + 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_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &red.x, 0); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.0f, 0.0f); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &green.x, 0); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 1.0f, 0.6f); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 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, &green, 0); + destroy_depth_stencil(&ds); destroy_test_context(&context); }

1 0

Józef Kucia : vkd3d: Defer creating render pass only when depth-stencil tests are enabled.
by Alexandre Julliard 17 May '19

17 May '19

Module: vkd3d Branch: master Commit: ee1b8cc511edede748ec5c67097bf56fab59136f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ee1b8cc511edede748ec5c6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 17 10:39:13 2019 +0200 vkd3d: Defer creating render pass only when depth-stencil tests are enabled. 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/state.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 7bce614..a447eb5 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2110,12 +2110,12 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s struct vkd3d_shader_interface_info shader_interface; const struct d3d12_root_signature *root_signature; struct vkd3d_shader_signature input_signature; + bool have_attachment, is_dsv_format_unknown; VkShaderStageFlagBits xfb_stage = 0; VkSampleCountFlagBits sample_count; const struct vkd3d_format *format; unsigned int instance_divisor; VkVertexInputRate input_rate; - bool have_attachment; unsigned int i, j; size_t rt_count; uint32_t mask; @@ -2527,8 +2527,10 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } + is_dsv_format_unknown = graphics->null_attachment_mask & (1u << graphics->rt_count); + rs_desc_from_d3d12(&graphics->rs_desc, &desc->RasterizerState); - have_attachment = graphics->rt_count || graphics->dsv_format || (graphics->null_attachment_mask & (1u << graphics->rt_count)); + have_attachment = graphics->rt_count || graphics->dsv_format || is_dsv_format_unknown; if ((!have_attachment && !(desc->PS.pShaderBytecode && desc->PS.BytecodeLength)) || so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM) graphics->rs_desc.rasterizerDiscardEnable = VK_TRUE; @@ -2554,7 +2556,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->ms_desc.alphaToCoverageEnable = desc->BlendState.AlphaToCoverageEnable; graphics->ms_desc.alphaToOneEnable = VK_FALSE; - if (graphics->dsv_format == VK_FORMAT_UNDEFINED) + /* We defer creating the render pass for pipelines wth DSVFormat equal to + * DXGI_FORMAT_UNKNOWN. We take the actual DSV format from the bound DSV. */ + if (is_dsv_format_unknown) graphics->render_pass = VK_NULL_HANDLE; else if (FAILED(hr = d3d12_graphics_pipeline_state_create_render_pass(graphics, device, 0, &graphics->render_pass)))

1 0

Józef Kucia : vkd3d: Handle lists in debug env vars consistently.
by Alexandre Julliard 17 May '19

17 May '19

Module: vkd3d Branch: master Commit: 51b930192a58b0856546d15191fc2be13cfafeb2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=51b930192a58b0856546d15… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 17 10:39:14 2019 +0200 vkd3d: Handle lists in debug env vars consistently. 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> --- include/private/vkd3d_debug.h | 2 ++ libs/vkd3d-common/debug.c | 42 ++++++++++++++++++++++++------------------ libs/vkd3d/device.c | 7 +------ 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 80c5781..2ef8a00 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -22,6 +22,7 @@ #include "vkd3d_common.h" #include <stdarg.h> +#include <stdbool.h> #include <stdint.h> #ifdef VKD3D_NO_TRACE_MESSAGES @@ -100,6 +101,7 @@ struct vkd3d_debug_option uint64_t flag; }; +bool vkd3d_debug_list_has_member(const char *string, const char *member) DECLSPEC_HIDDEN; uint64_t vkd3d_parse_debug_options(const char *string, const struct vkd3d_debug_option *options, unsigned int option_count) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index 9a27c22..33deed6 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -323,34 +323,40 @@ static bool is_option_separator(char c) return c == ',' || c == ';' || c == '\0'; } +bool vkd3d_debug_list_has_member(const char *string, const char *member) +{ + char prev_char, next_char; + const char *p; + + p = string; + while (p) + { + if ((p = strstr(p, member))) + { + prev_char = p > string ? p[-1] : 0; + p += strlen(member); + next_char = *p; + + if (is_option_separator(prev_char) && is_option_separator(next_char)) + return true; + } + } + + return false; +} + uint64_t vkd3d_parse_debug_options(const char *string, const struct vkd3d_debug_option *options, unsigned int option_count) { - char prev_char, next_char; uint64_t flags = 0; unsigned int i; - const char *p; for (i = 0; i < option_count; ++i) { const struct vkd3d_debug_option *opt = &options[i]; - p = string; - while (p) - { - if ((p = strstr(p, opt->name))) - { - prev_char = p > string ? p[-1] : 0; - p += strlen(opt->name); - next_char = *p; - - if (is_option_separator(prev_char) && is_option_separator(next_char)) - { - flags |= opt->flag; - break; - } - } - } + if (vkd3d_debug_list_has_member(string, opt->name)) + flags |= opt->flag; } return flags; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5c15808..5239911 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -180,16 +180,11 @@ static unsigned int get_spec_version(const VkExtensionProperties *extensions, static bool is_extension_disabled(const char *extension_name) { const char *disabled_extensions; - const char *s; - size_t len; if (!(disabled_extensions = getenv("VKD3D_DISABLE_EXTENSIONS"))) return false; - if (!(s = strstr(disabled_extensions, extension_name))) - return false; - len = strlen(extension_name); - return s[len] == ';' || s[len] == '\0'; + return vkd3d_debug_list_has_member(disabled_extensions, extension_name); } static bool has_extension(const VkExtensionProperties *extensions,

1 0

Józef Kucia : readme: Document environment variables.
by Alexandre Julliard 17 May '19

17 May '19

Module: vkd3d Branch: master Commit: 33ba9b27ed7cb8d43a655130fcbad368fa195116 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=33ba9b27ed7cb8d43a65513… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 17 10:39:15 2019 +0200 readme: Document environment variables. 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> --- README | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/README b/README index be329e1..b9853ba 100644 --- a/README +++ b/README @@ -28,3 +28,40 @@ at build-time with some modest source modifications. If vkd3d is available when building Wine, then Wine will use it to support Direct3D 12 applications. + +===================== +Environment variables +===================== + +Most of the environment variables used by vkd3d are for debugging purposes. The +environment variables are not considered a part of API and might be changed or +removed in the future versions of vkd3d. + +Some of debug variables are lists of elements. Elements must be separated by +commas or semicolons. + + * VKD3D_CONFIG - a list of options that change the behavior of libvkd3d. + * vk_debug - enables Vulkan debug extensions. + + * VKD3D_DEBUG - controls the debug level for log messages produced by + libvkd3d. Accepts the following values: none, err, fixme, warn, trace. + + * VKD3D_VULKAN_DEVICE - a zero-based device index. Use to force the selected + Vulkan device. + + * VKD3D_DISABLE_EXTENSIONS - a list of Vulkan extensions that libvkd3d should + not use even if available. + + * VKD3D_SHADER_DEBUG - controls the debug level for log messages produced by + libvkd3d-shader. See VKD3D_DEBUG for accepted values. + + * VKD3D_SHADER_DUMP_PATH - path where shader bytecode is dumped. + + * VKD3D_TEST_DEBUG - enables additional debug messages in tests. Set to 0, 1 + or 2. + + * VKD3D_TEST_PLATFORM - can be set to "wine", "windows" or "other". The test + platform controls the behavior of todo(), todo_if(), bug_if() and broken() + conditions in tests. + + * VKD3D_TEST_BUG - set to 0 to disable bug_if() conditions in tests.

1 0

Józef Kucia : readme: Document build macros.
by Alexandre Julliard 17 May '19

17 May '19

Module: vkd3d Branch: master Commit: 1930e60ab38d9b11cce46a90d7a2245c478fbe3d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1930e60ab38d9b11cce46a9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 17 10:39:16 2019 +0200 readme: Document build macros. 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> --- README | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README b/README index b9853ba..2e42249 100644 --- a/README +++ b/README @@ -19,6 +19,11 @@ available or is not recent (>= 3.20), then you can build Wine with `make tools/widl' to avoid building all of Wine. You can then point vkd3d's configure at that widl binary with `WIDL="/path/to/widl"'. +For release builds, you may want to define NDEBUG. If you do not need debug log +messages, you may also consider VKD3D_NO_TRACE_MESSAGES and +VKD3D_NO_DEBUG_MESSAGES. For example, you can pass `CPPFLAGS="-DNDEBUG +-DVKD3D_NO_TRACE_MESSAGES"' to configure. + =========== Using vkd3d ===========

1 0