wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Vijay Kiran Kamuju : wpcap: Fix compile warnings for redefinition of PCAP_OPENFLAG_PROMISCUOUS.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 660399b8fd905a208f192781723f7fe881b132fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=660399b8fd905a208f192781… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri May 3 18:49:48 2019 +0200 wpcap: Fix compile warnings for redefinition of PCAP_OPENFLAG_PROMISCUOUS. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/wpcap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index f163235..6450a0e 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -254,7 +254,9 @@ int CDECL wine_pcap_next_ex(pcap_t *p, struct pcap_pkthdr **pkt_header, const un return pcap_next_ex(p, pkt_header, pkt_data); } +#ifndef PCAP_OPENFLAG_PROMISCUOUS #define PCAP_OPENFLAG_PROMISCUOUS 1 +#endif pcap_t* CDECL wine_pcap_open(const char *source, int snaplen, int flags, int read_timeout, void *auth, char *errbuf)

1 0

Alexandre Julliard : winhttp/tests: Get a test file from the WineHQ tests subdirectory.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 4cc3ef939143118b226b4a2e9193776e3e2119d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cc3ef939143118b226b4a2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 6 03:41:14 2019 -0500 winhttp/tests: Get a test file from the WineHQ tests subdirectory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 3a28acf..dfd3c4d 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -4637,7 +4637,7 @@ static void test_WinHttpGetProxyForUrl(void) static void test_chunked_read(void) { - static const WCHAR verb[] = {'/','t','e','s','t','c','h','u','n','k','e','d',0}; + static const WCHAR verb[] = {'/','t','e','s','t','s','/','c','h','u','n','k','e','d',0}; static const WCHAR chunked[] = {'c','h','u','n','k','e','d',0}; WCHAR header[32]; DWORD len, err;

1 0

Alexandre Julliard : winefile: Explicitly mark qsort() callback funtions cdecl.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 50af5c83371703016f759abfdc0dc654ae888b84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50af5c83371703016f759abf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 6 03:41:07 2019 -0500 winefile: Explicitly mark qsort() callback funtions cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winefile/winefile.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index d69cbcb..fa78237 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -855,7 +855,7 @@ static int compareType(const WIN32_FIND_DATAW* fd1, const WIN32_FIND_DATAW* fd2) } -static int compareName(const void* arg1, const void* arg2) +static int __cdecl compareName(const void* arg1, const void* arg2) { const WIN32_FIND_DATAW* fd1 = &(*(const Entry* const*)arg1)->data; const WIN32_FIND_DATAW* fd2 = &(*(const Entry* const*)arg2)->data; @@ -867,7 +867,7 @@ static int compareName(const void* arg1, const void* arg2) return lstrcmpiW(fd1->cFileName, fd2->cFileName); } -static int compareExt(const void* arg1, const void* arg2) +static int __cdecl compareExt(const void* arg1, const void* arg2) { const WIN32_FIND_DATAW* fd1 = &(*(const Entry* const*)arg1)->data; const WIN32_FIND_DATAW* fd2 = &(*(const Entry* const*)arg2)->data; @@ -900,7 +900,7 @@ static int compareExt(const void* arg1, const void* arg2) return lstrcmpiW(name1, name2); } -static int compareSize(const void* arg1, const void* arg2) +static int __cdecl compareSize(const void* arg1, const void* arg2) { const WIN32_FIND_DATAW* fd1 = &(*(const Entry* const*)arg1)->data; const WIN32_FIND_DATAW* fd2 = &(*(const Entry* const*)arg2)->data; @@ -921,7 +921,7 @@ static int compareSize(const void* arg1, const void* arg2) return cmp<0? -1: cmp>0? 1: 0; } -static int compareDate(const void* arg1, const void* arg2) +static int __cdecl compareDate(const void* arg1, const void* arg2) { const WIN32_FIND_DATAW* fd1 = &(*(const Entry* const*)arg1)->data; const WIN32_FIND_DATAW* fd2 = &(*(const Entry* const*)arg2)->data; @@ -934,7 +934,7 @@ static int compareDate(const void* arg1, const void* arg2) } -static int (*sortFunctions[])(const void* arg1, const void* arg2) = { +static int (CDECL *sortFunctions[])(const void* arg1, const void* arg2) = { compareName, /* SORT_NAME */ compareExt, /* SORT_EXT */ compareSize, /* SORT_SIZE */

1 0

Alexandre Julliard : uninstaller: Explicitly mark a qsort() callback funtion cdecl.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 89cbab5d518fda590a5fb45a1bbd300b0bcb4c69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89cbab5d518fda590a5fb45a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 6 03:40:58 2019 -0500 uninstaller: Explicitly mark a qsort() callback funtion cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/uninstaller/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index fa9a23c..5e48306 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -46,7 +46,6 @@ static WCHAR *sFilter; static int FetchUninstallInformation(void); static void UninstallProgram(void); -static int cmp_by_name(const void *a, const void *b); static const WCHAR DisplayNameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; static const WCHAR PathUninstallW[] = { @@ -233,7 +232,7 @@ int wmain(int argc, WCHAR *argv[]) /** * Used to sort entries by name. */ -static int cmp_by_name(const void *a, const void *b) +static int __cdecl cmp_by_name(const void *a, const void *b) { return lstrcmpiW(((const uninst_entry *)a)->descr, ((const uninst_entry *)b)->descr); }

1 0

Alexandre Julliard : services: Explicitly mark a qsort() callback funtion cdecl.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 4b69b6710a806a8234788b3c97a90a3104fbe27b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b69b6710a806a8234788b3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 6 03:40:48 2019 -0500 services: Explicitly mark a qsort() callback funtion cdecl. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47122 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/services/services.c b/programs/services/services.c index 971be4d..0634c83 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -322,7 +322,7 @@ static void scmdatabase_remove_service(struct scmdatabase *db, struct service_en service->entry.next = service->entry.prev = NULL; } -static int compare_tags(const void *a, const void *b) +static int __cdecl compare_tags(const void *a, const void *b) { struct service_entry *service_a = *(struct service_entry **)a; struct service_entry *service_b = *(struct service_entry **)b;

1 0

Alexandre Julliard : cmd: Explicitly mark qsort() callback funtions cdecl.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 7f0272a59ab0780086051e6396949fe784503837 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f0272a59ab0780086051e63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 6 03:40:25 2019 -0500 cmd: Explicitly mark qsort() callback funtions cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 2 +- programs/cmd/directory.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5fc1921..62ae19a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3562,7 +3562,7 @@ void WCMD_setshow_date (void) { * Note: Native displays 'fred' before 'fred ', so need to only compare up to * the equals sign. */ -static int WCMD_compare( const void *a, const void *b ) +static int __cdecl WCMD_compare( const void *a, const void *b ) { int r; const WCHAR * const *str_a = a, * const *str_b = b; diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 02ea487..c38bdfc 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -101,7 +101,7 @@ static WCHAR * WCMD_filesize64 (ULONGLONG n) { * * Sort based on the /O options supplied on the command line */ -static int WCMD_dir_sort (const void *a, const void *b) +static int __cdecl WCMD_dir_sort (const void *a, const void *b) { const WIN32_FIND_DATAW *filea = (const WIN32_FIND_DATAW *)a; const WIN32_FIND_DATAW *fileb = (const WIN32_FIND_DATAW *)b;

1 0

Józef Kucia : include: Define TRACE_ON() for VKD3D_NO_TRACE_MESSAGES.
by Alexandre Julliard 06 May '19

06 May '19

Module: vkd3d Branch: master Commit: 9babc0fb44f70c739b2d7cea7f8e43fe2690a89a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9babc0fb44f70c739b2d7ce… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 6 14:47:43 2019 +0200 include: Define TRACE_ON() for VKD3D_NO_TRACE_MESSAGES. 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 7642dec..80c5781 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -26,6 +26,7 @@ #ifdef VKD3D_NO_TRACE_MESSAGES #define TRACE(args...) do { } while (0) +#define TRACE_ON() (false) #endif #ifdef VKD3D_NO_DEBUG_MESSAGES @@ -74,7 +75,9 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; #define ERR VKD3D_DBG_LOG(ERR) +#ifndef TRACE_ON #define TRACE_ON() (vkd3d_dbg_get_level() == VKD3D_DBG_LEVEL_TRACE) +#endif #define VKD3D_DEBUG_ENV_NAME(name) const char *vkd3d_dbg_env_name = name

1 0

Józef Kucia : vkd3d: Allow 0 vertex stride.
by Alexandre Julliard 06 May '19

06 May '19

Module: vkd3d Branch: master Commit: 8a23ff13760ac05a5a0c4df14b3246ab5f93cfa8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8a23ff13760ac05a5a0c4df… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 6 14:47:42 2019 +0200 vkd3d: Allow 0 vertex stride. 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 | 3 - tests/d3d12.c | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 171 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 6a7b6e5..054a9ae 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2744,9 +2744,6 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta b->stride = strides[binding]; b->inputRate = graphics->input_rates[binding]; - if (!b->stride) - FIXME("Invalid stride for input slot %u.\n", binding); - pipeline_key.strides[binding_count] = strides[binding]; ++binding_count; diff --git a/tests/d3d12.c b/tests/d3d12.c index 2c8c44b..d5f491e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21627,6 +21627,176 @@ static void test_dispatch_zero_thread_groups(void) destroy_test_context(&context); } +static void test_zero_vertex_stride(void) +{ + ID3D12PipelineState *instance_pipeline_state; + ID3D12GraphicsCommandList *command_list; + D3D12_INPUT_LAYOUT_DESC input_layout; + D3D12_VERTEX_BUFFER_VIEW vbv[2]; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Resource *vb[2]; + + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"sv_position", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D12_APPEND_ALIGNED_ELEMENT, + D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"color", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 1, D3D12_APPEND_ALIGNED_ELEMENT, + D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const D3D12_INPUT_ELEMENT_DESC instance_layout_desc[] = + { + {"sv_position", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D12_APPEND_ALIGNED_ELEMENT, + D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"color", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 1, D3D12_APPEND_ALIGNED_ELEMENT, + D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA, 0}, + }; + static const DWORD vs_code[] = + { +#if 0 + struct vs_data + { + float4 pos : SV_POSITION; + float4 color : COLOR; + }; + + void main(in struct vs_data vs_input, out struct vs_data vs_output) + { + vs_output.pos = vs_input.pos; + vs_output.color = vs_input.color; + } +#endif + 0x43425844, 0xd5b32785, 0x35332906, 0x4d05e031, 0xf66a58af, 0x00000001, 0x00000144, 0x00000003, + 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x00000068, 0x00010040, + 0x0000001a, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x04000067, + 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const DWORD ps_code[] = + { +#if 0 + struct ps_data + { + float4 pos : SV_POSITION; + float4 color : COLOR; + }; + + float4 main(struct ps_data ps_input) : SV_Target + { + return ps_input.color; + } +#endif + 0x43425844, 0x89803e59, 0x3f798934, 0xf99181df, 0xf5556512, 0x00000001, 0x000000f4, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const struct vec4 positions[] = + { + {-1.0f, -1.0f, 0.0f, 1.0f}, + {-1.0f, 1.0f, 0.0f, 1.0f}, + { 1.0f, -1.0f, 0.0f, 1.0f}, + { 1.0f, 1.0f, 0.0f, 1.0f}, + }; + static const struct vec4 colors[] = + { + {0.0f, 1.0f, 0.0f, 1.0f}, + {1.0f, 0.0f, 0.0f, 1.0f}, + {0.5f, 0.5f, 0.5f, 1.0f}, + {1.0f, 0.0f, 1.0f, 1.0f}, + {1.0f, 0.0f, 1.0f, 1.0f}, + {1.0f, 0.0f, 1.0f, 1.0f}, + {1.0f, 0.0f, 1.0f, 1.0f}, + {1.0f, 0.0f, 1.0f, 1.0f}, + {1.0f, 0.0f, 1.0f, 1.0f}, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + context.root_signature = create_empty_root_signature(context.device, + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT); + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout); + + input_layout.pInputElementDescs = instance_layout_desc; + input_layout.NumElements = ARRAY_SIZE(instance_layout_desc); + instance_pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout); + + memset(vbv, 0, sizeof(vbv)); + vb[0] = create_upload_buffer(context.device, sizeof(positions), positions); + vbv[0].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[0]); + vbv[0].StrideInBytes = sizeof(*positions); + vbv[0].SizeInBytes = sizeof(positions); + + vb[1] = create_upload_buffer(context.device, sizeof(colors), colors); + vbv[1].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[1]) + 2 * sizeof(*colors); + vbv[1].StrideInBytes = 0; + vbv[1].SizeInBytes = sizeof(colors); + + 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_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 4, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff808080, 2); + + 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); + + vbv[1].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[1]); + + 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, instance_pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 4, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + ID3D12Resource_Release(vb[1]); + ID3D12Resource_Release(vb[0]); + ID3D12PipelineState_Release(instance_pipeline_state); + destroy_test_context(&context); +} + static void test_instance_id(void) { D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; @@ -28910,6 +29080,7 @@ START_TEST(d3d12) run_test(test_resolve_query_data_in_reordered_command_list); run_test(test_execute_indirect); run_test(test_dispatch_zero_thread_groups); + run_test(test_zero_vertex_stride); run_test(test_instance_id); run_test(test_vertex_id); run_test(test_copy_texture);

1 0

Józef Kucia : tests: Introduce queue_{signal, wait}() helpers.
by Alexandre Julliard 06 May '19

06 May '19

Module: vkd3d Branch: master Commit: 890a77559f94d9582b665574aeee921ffd14ff82 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=890a77559f94d9582b66557… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 6 14:47:41 2019 +0200 tests: Introduce queue_{signal,wait}() helpers. 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 | 117 ++++++++++++++++------------------------------- tests/d3d12_test_utils.h | 18 ++++++++ 2 files changed, 57 insertions(+), 78 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=890a77559f94d9582b6…

1 0

Józef Kucia : vkd3d: Reuse Vulkan semaphores.
by Alexandre Julliard 06 May '19

06 May '19

Module: vkd3d Branch: master Commit: 0f5868cc4ea33c91a754d312b4881327dceb945a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0f5868cc4ea33c91a754d31… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 6 14:47:40 2019 +0200 vkd3d: Reuse Vulkan semaphores. 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/command.c | 108 ++++++++++++++++++++++++++++++++++++--------- libs/vkd3d/vkd3d_private.h | 10 +++-- 2 files changed, 92 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 53675d5..960d3be 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -49,6 +49,8 @@ HRESULT vkd3d_queue_create(struct d3d12_device *device, object->semaphores_size = 0; object->semaphore_count = 0; + memset(object->old_vk_semaphores, 0, sizeof(object->old_vk_semaphores)); + VK_CALL(vkGetDeviceQueue(device->vk_device, family_index, 0, &object->vk_queue)); TRACE("Created queue %p for queue family index %u.\n", object, family_index); @@ -72,6 +74,12 @@ void vkd3d_queue_destroy(struct vkd3d_queue *queue, struct d3d12_device *device) vkd3d_free(queue->semaphores); + for (i = 0; i < ARRAY_SIZE(queue->old_vk_semaphores); ++i) + { + if (queue->old_vk_semaphores[i]) + VK_CALL(vkDestroySemaphore(device->vk_device, queue->old_vk_semaphores[i], NULL)); + } + if (!rc) pthread_mutex_unlock(&queue->mutex); @@ -129,8 +137,10 @@ static void vkd3d_queue_update_sequence_number(struct vkd3d_queue *queue, uint64_t sequence_number, struct d3d12_device *device) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + unsigned int destroyed_semaphore_count = 0; uint64_t completed_sequence_number; - unsigned int i; + VkSemaphore vk_semaphore; + unsigned int i, j; int rc; if ((rc = pthread_mutex_lock(&queue->mutex))) @@ -149,15 +159,34 @@ static void vkd3d_queue_update_sequence_number(struct vkd3d_queue *queue, if (queue->semaphores[i].sequence_number > queue->completed_sequence_number) break; - VK_CALL(vkDestroySemaphore(device->vk_device, queue->semaphores[i].vk_semaphore, NULL)); + vk_semaphore = queue->semaphores[i].vk_semaphore; + + /* Try to store the Vulkan semaphore for reuse. */ + for (j = 0; j < ARRAY_SIZE(queue->old_vk_semaphores); ++j) + { + if (queue->old_vk_semaphores[j] == VK_NULL_HANDLE) + { + queue->old_vk_semaphores[j] = vk_semaphore; + vk_semaphore = VK_NULL_HANDLE; + break; + } + } + + if (!vk_semaphore) + continue; + + VK_CALL(vkDestroySemaphore(device->vk_device, vk_semaphore, NULL)); + ++destroyed_semaphore_count; } if (i > 0) { - TRACE("Destroyed %u Vulkan semaphores.\n", i); queue->semaphore_count -= i; memmove(queue->semaphores, &queue->semaphores[i], queue->semaphore_count * sizeof(*queue->semaphores)); } + if (destroyed_semaphore_count) + TRACE("Destroyed %u Vulkan semaphores.\n", destroyed_semaphore_count); + pthread_mutex_unlock(&queue->mutex); } @@ -176,6 +205,42 @@ static uint64_t vkd3d_queue_reset_sequence_number_locked(struct vkd3d_queue *que return queue->submitted_sequence_number; } +static VkResult vkd3d_queue_create_vk_semaphore_locked(struct vkd3d_queue *queue, + struct d3d12_device *device, VkSemaphore *vk_semaphore) +{ + const struct vkd3d_vk_device_procs *vk_procs; + VkSemaphoreCreateInfo semaphore_info; + unsigned int i; + VkResult vr; + + *vk_semaphore = VK_NULL_HANDLE; + + for (i = 0; i < ARRAY_SIZE(queue->old_vk_semaphores); ++i) + { + if ((*vk_semaphore = queue->old_vk_semaphores[i])) + { + queue->old_vk_semaphores[i] = VK_NULL_HANDLE; + break; + } + } + + if (*vk_semaphore) + return VK_SUCCESS; + + vk_procs = &device->vk_procs; + + semaphore_info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO; + semaphore_info.pNext = NULL; + semaphore_info.flags = 0; + if ((vr = VK_CALL(vkCreateSemaphore(device->vk_device, &semaphore_info, NULL, vk_semaphore))) < 0) + { + WARN("Failed to create Vulkan semaphore, vr %d.\n", vr); + *vk_semaphore = VK_NULL_HANDLE; + } + + return vr; +} + /* Fence worker thread */ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, VkFence vk_fence, struct d3d12_fence *fence, uint64_t value, @@ -488,6 +553,8 @@ static VkResult d3d12_fence_create_vk_fence(struct d3d12_fence *fence, VkFence * VkResult vr; int rc; + *vk_fence = VK_NULL_HANDLE; + if ((rc = pthread_mutex_lock(&fence->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); @@ -515,7 +582,10 @@ create_fence: fence_info.pNext = NULL; fence_info.flags = 0; if ((vr = VK_CALL(vkCreateFence(device->vk_device, &fence_info, NULL, vk_fence))) < 0) + { + WARN("Failed to create Vulkan fence, vr %d.\n", vr); *vk_fence = VK_NULL_HANDLE; + } return vr; } @@ -529,12 +599,12 @@ static void d3d12_fence_garbage_collect_vk_semaphores_locked(struct d3d12_fence unsigned int semaphore_count; semaphore_count = fence->semaphore_count; - if (!destroy_all && semaphore_count < VKD3D_MAX_VK_SYNC_OBJECTS_PER_D3D12_FENCE) + if (!destroy_all && semaphore_count < VKD3D_MAX_VK_SYNC_OBJECTS) return; LIST_FOR_EACH_ENTRY_SAFE(current, p, &fence->semaphores, struct vkd3d_signaled_semaphore, entry) { - if (!destroy_all && fence->semaphore_count < VKD3D_MAX_VK_SYNC_OBJECTS_PER_D3D12_FENCE) + if (!destroy_all && fence->semaphore_count < VKD3D_MAX_VK_SYNC_OBJECTS) break; /* The semaphore doesn't have a pending signal operation if the fence @@ -5259,7 +5329,6 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); const struct vkd3d_vk_device_procs *vk_procs; VkSemaphore vk_semaphore = VK_NULL_HANDLE; - VkSemaphoreCreateInfo semaphore_info; VkFence vk_fence = VK_NULL_HANDLE; struct vkd3d_queue *vkd3d_queue; struct d3d12_device *device; @@ -5284,15 +5353,17 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * goto fail_vkresult; } - /* XXX: It may be a good idea to re-use Vulkan semaphores. */ - semaphore_info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO; - semaphore_info.pNext = NULL; - semaphore_info.flags = 0; - if ((vr = VK_CALL(vkCreateSemaphore(device->vk_device, &semaphore_info, NULL, &vk_semaphore))) < 0) + if (!(vk_queue = vkd3d_queue_acquire(vkd3d_queue))) { - WARN("Failed to create Vulkan semaphore, vr %d.\n", vr); + ERR("Failed to acquire queue %p.\n", vkd3d_queue); + hr = E_FAIL; + goto fail; + } + + if ((vr = vkd3d_queue_create_vk_semaphore_locked(vkd3d_queue, device, &vk_semaphore)) < 0) + { + ERR("Failed to create Vulkan semaphore, vr %d.\n", vr); vk_semaphore = VK_NULL_HANDLE; - goto fail_vkresult; } submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; @@ -5302,16 +5373,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * submit_info.pWaitDstStageMask = NULL; submit_info.commandBufferCount = 0; submit_info.pCommandBuffers = NULL; - submit_info.signalSemaphoreCount = 1; + submit_info.signalSemaphoreCount = vk_semaphore ? 1 : 0; submit_info.pSignalSemaphores = &vk_semaphore; - if (!(vk_queue = vkd3d_queue_acquire(vkd3d_queue))) - { - ERR("Failed to acquire queue %p.\n", vkd3d_queue); - hr = E_FAIL; - goto fail; - } - if ((vr = VK_CALL(vkQueueSubmit(vk_queue, 1, &submit_info, vk_fence))) >= 0) { sequence_number = ++vkd3d_queue->submitted_sequence_number; @@ -5329,7 +5393,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * goto fail_vkresult; } - if (SUCCEEDED(hr = d3d12_fence_add_vk_semaphore(fence, vk_semaphore, vk_fence, value))) + if (vk_semaphore && SUCCEEDED(hr = d3d12_fence_add_vk_semaphore(fence, vk_semaphore, vk_fence, value))) vk_semaphore = VK_NULL_HANDLE; vr = VK_CALL(vkGetFenceStatus(device->vk_device, vk_fence)); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 349591d..8314298 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -48,9 +48,9 @@ #define VKD3D_DESCRIPTOR_MAGIC_DSV 0x00565344u #define VKD3D_DESCRIPTOR_MAGIC_RTV 0x00565452u -#define VKD3D_MAX_QUEUE_FAMILY_COUNT 3u -#define VKD3D_MAX_SHADER_STAGES 5u -#define VKD3D_MAX_VK_SYNC_OBJECTS_PER_D3D12_FENCE 4u +#define VKD3D_MAX_QUEUE_FAMILY_COUNT 3u +#define VKD3D_MAX_SHADER_STAGES 5u +#define VKD3D_MAX_VK_SYNC_OBJECTS 4u struct d3d12_command_list; struct d3d12_device; @@ -310,7 +310,7 @@ struct d3d12_fence struct list semaphores; unsigned int semaphore_count; - VkFence old_vk_fences[VKD3D_MAX_VK_SYNC_OBJECTS_PER_D3D12_FENCE]; + VkFence old_vk_fences[VKD3D_MAX_VK_SYNC_OBJECTS]; struct d3d12_device *device; @@ -902,6 +902,8 @@ struct vkd3d_queue } *semaphores; size_t semaphores_size; size_t semaphore_count; + + VkSemaphore old_vk_semaphores[VKD3D_MAX_VK_SYNC_OBJECTS]; }; VkQueue vkd3d_queue_acquire(struct vkd3d_queue *queue) DECLSPEC_HIDDEN;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2019