wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

Francois Gouget : testbot: Improve the log naming scheme.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: tools Branch: master Commit: 0c98cb701312c023ad73eff7d27fe1d998520fc4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0c98cb701312c023ad73eff… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 23 10:48:29 2018 +0200 testbot: Improve the log naming scheme. Tasks generate multiple types of logs and reports: * 32 bit and / or 64 bit test reports(in *.report). * A list of inconsistencies found in each test report (in err). * A build or task log (in log). * A list of task errors (in err). * When a TestBot error occurs and a task gets restarted, the old task logs are preserved in *.old files. So far a task would generate either a single .report file or the log file which is why the above scheme was sufficient. However this is bound to change and there are additional constraints to accommodate: * Running the tests on Wine will generate both a build log and a test report. * It may also be desirable to run both the 32 and 64 bit WoW Wine tests in a single task which would result in it having both a wow32.report and a wow64.report file in addition to the log one. * If a task has two test reports the corresponding inconsistencies must be easily identifiable and kept separate. This also means not mixing them with the generic task errors. * WineTest's reference logs are stored in 'vmname_*.log' files where the variable part is computed differently for the Windows and Wine reports. So this patch tweaks the log and report naming scheme to avoid mixing messages from different sources and to make it easier to match logs and error files: * For each log or report called 'xxx', any additional error message will go to 'xxx.err'. This means any inconsistencies found in 'wow32.report' will go to 'wow32.report.err' and will not be mixed with those of the 64 bit report. * Old versions of a log, report or error file called 'xxx' will be concatenated in 'old_xxx' (and the corresponding old errors would be in 'old_xxx.err'). * The reference version of a report, log or error file called 'xxx' will be stored in 'vmname_xxx'. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 15 +++++++++++ testbot/bin/Janitor.pl | 2 +- testbot/bin/WineRunBuild.pl | 4 +-- testbot/bin/WineRunReconfig.pl | 4 +-- testbot/bin/WineRunTask.pl | 27 ++++++++++--------- testbot/bin/WineRunWineTest.pl | 32 +++++++++++++--------- testbot/bin/WineSendLog.pl | 22 +++++++-------- testbot/lib/WineTestBot/LogUtils.pm | 54 +++++++++++++++++++++++++++++++++---- testbot/lib/WineTestBot/Tasks.pm | 16 ++++++----- testbot/web/JobDetails.pl | 4 +-- testbot/web/Munin.pl | 2 +- 11 files changed, 127 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=0c98cb701312c023ad7…

1 0

Francois Gouget : testbot: Remove support for the old task status lines.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: tools Branch: master Commit: a8430bf9165051f41657634a925e9675482a22ae URL: https://source.winehq.org/git/tools.git/?a=commit;h=a8430bf9165051f41657634… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 23 10:46:29 2018 +0200 testbot: Remove support for the old task status lines. Note that there is no need to wait for all task logs to be in the new format because ParseTaskLog() is only called when a new task completes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunReconfig.pl | 2 +- testbot/bin/WineRunWineTest.pl | 2 +- testbot/lib/WineTestBot/LogUtils.pm | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 2c5fbfa..b246164 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -406,7 +406,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Build.log'\n"); if ($TA->GetFile("Build.log", "$TaskDir/log")) { - my $Result = ParseTaskLog("$TaskDir/log", "Build"); + my $Result = ParseTaskLog("$TaskDir/log"); if ($Result eq "ok") { # We must have gotten the full log and the build did succeed. diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 2301804..1e126b8 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -388,7 +388,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Reconfig.log'\n"); if ($TA->GetFile("Reconfig.log", "$TaskDir/log")) { - my $Result = ParseTaskLog("$TaskDir/log", "Reconfig"); + my $Result = ParseTaskLog("$TaskDir/log"); if ($Result eq "ok") { # We must have gotten the full log and the build did succeed. diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 2168111..2552a7c 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -499,7 +499,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); if ($TA->GetFile("Task.log", "$TaskDir/log")) { - my $Result = ParseTaskLog("$TaskDir/log", "Task"); + my $Result = ParseTaskLog("$TaskDir/log"); if ($Result eq "ok") { # We must have gotten the full log and the build did succeed. diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index d39c81b..e05afb6 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -50,9 +50,9 @@ Returns ok if the task was successful and an error code otherwise. =back =cut -sub ParseTaskLog($$) +sub ParseTaskLog($) { - my ($FileName, $ResultPrefix) = @_; + my ($FileName) = @_; if (open(my $LogFile, "<", $FileName)) { @@ -60,16 +60,16 @@ sub ParseTaskLog($$) foreach my $Line (<$LogFile>) { chomp $Line; - if ($Line =~ /^(?:$ResultPrefix|Task): ok$/) + if ($Line =~ /^Task: ok$/) { $Result ||= "ok"; } - elsif ($Line =~ /^(?:$ResultPrefix|Task): Patch failed to apply$/) + elsif ($Line =~ /^Task: Patch failed to apply$/) { $Result = "badpatch"; last; # Should be the last and most specific message } - elsif ($Line =~ /^(?:$ResultPrefix|Task): /) + elsif ($Line =~ /^Task: /) { $Result = "failed"; }

1 0

Francois Gouget : testbot/WineRunBuild: Check dependencies when grabbing test executables.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: tools Branch: master Commit: a3a72ab6361034459f4319deff0c7566a79aea04 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a3a72ab6361034459f4319d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 23 10:46:45 2018 +0200 testbot/WineRunBuild: Check dependencies when grabbing test executables. There is no need to try and grab test executables for steps that don't depend on this build step. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 32369b1..2c5fbfa 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -342,7 +342,8 @@ if ($Step->FileType ne "patch") my (%Bitnesses, %TestExes); foreach my $TestStep (@{$Job->Steps->GetItems()}) { - if ($TestStep->FileType =~ /^exe([0-9]+)$/) + if (($TestStep->PreviousNo || 0) == $Step->No and + $TestStep->FileType =~ /^exe([0-9]+)$/) { $Bitnesses{$1} = 1; $TestExes{$TestStep->FileName} = 1;

1 0

Józef Kucia : tests: Use single ResolveQueryData() call for multiple queries.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: vkd3d Branch: master Commit: 98b3487b3c932e33bca958920a52d8005ce71ead URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=98b3487b3c932e33bca9589… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 23 18:33:08 2018 +0200 tests: Use single ResolveQueryData() call for multiple queries. 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 | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index eefef3b..ca83680 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -15777,19 +15777,19 @@ static void test_create_query_heap(void) static void test_query_timestamp(void) { + UINT64 timestamps[4], timestamp_frequency, timestamp_diff, time_diff; ID3D12GraphicsCommandList *command_list; - struct test_context_desc desc; - struct test_context context; - ID3D12CommandQueue *queue; - ID3D12Device *device; D3D12_QUERY_HEAP_DESC heap_desc; + struct test_context_desc desc; ID3D12QueryHeap *query_heap; - ID3D12Resource *resource; struct resource_readback rb; - UINT64 timestamps[4], timestamp_frequency, timestamp_diff, time_diff; + struct test_context context; time_t time_start, time_end; + ID3D12CommandQueue *queue; + ID3D12Resource *resource; + ID3D12Device *device; + unsigned int i; HRESULT hr; - int i; time_start = time(NULL); @@ -15813,11 +15813,12 @@ static void test_query_timestamp(void) resource = create_readback_buffer(device, sizeof(timestamps)); for (i = 0; i < ARRAY_SIZE(timestamps); ++i) - { ID3D12GraphicsCommandList_EndQuery(command_list, query_heap, D3D12_QUERY_TYPE_TIMESTAMP, i); - ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, D3D12_QUERY_TYPE_TIMESTAMP, i, 1, - resource, i * sizeof(UINT64)); - } + + ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, + D3D12_QUERY_TYPE_TIMESTAMP, 0, 1, resource, 0); + ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, + D3D12_QUERY_TYPE_TIMESTAMP, 1, 3, resource, sizeof(UINT64)); get_buffer_readback_with_command_list(resource, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); @@ -15827,14 +15828,16 @@ static void test_query_timestamp(void) timestamps[i] = get_readback_uint64(&rb, i, 0); for (i = 0; i < ARRAY_SIZE(timestamps) - 1; ++i) + { ok(timestamps[i] <= timestamps[i + 1], "Expected timestamps to monotonically increase, " "but got %"PRIu64" > %"PRIu64".\n", timestamps[i], timestamps[i + 1]); + } time_diff = (UINT64)difftime(time_end, time_start) * timestamp_frequency; timestamp_diff = timestamps[ARRAY_SIZE(timestamps) - 1] - timestamps[0]; ok(timestamp_diff <= time_diff, "Expected timestamp difference to be bounded by CPU time difference, " - "but got %"PRIu64" > %"PRIu64".\n", timestamp_diff, time_diff); + "but got %"PRIu64" > %"PRIu64".\n", timestamp_diff, time_diff); release_resource_readback(&rb); ID3D12QueryHeap_Release(query_heap);

1 0

Józef Kucia : vkd3d: Validate D3D12_BLEND_DESC.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: vkd3d Branch: master Commit: bdc848b27a255cc3e55179f1b0259f6e7786ae88 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bdc848b27a255cc3e55179f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 23 18:33:07 2018 +0200 vkd3d: Validate D3D12_BLEND_DESC. 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 | 1 - libs/vkd3d/state.c | 24 ++++++++++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3c254c0..7aa1695 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1786,7 +1786,6 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list blend_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; blend_desc.pNext = NULL; blend_desc.flags = 0; - /* FIXME: Logic ops are per-target in D3D. */ blend_desc.logicOpEnable = VK_FALSE; blend_desc.logicOp = VK_LOGIC_OP_COPY; blend_desc.attachmentCount = state->attachment_count - state->rt_idx; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 43b1c15..5e401fd 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1876,6 +1876,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s state->vk_set_layout = VK_NULL_HANDLE; state->uav_counters = NULL; state->uav_counter_mask = 0; + graphics->stage_count = 0; + + memset(&input_signature, 0, sizeof(input_signature)); if (!(root_signature = unsafe_impl_from_ID3D12RootSignature(desc->pRootSignature))) { @@ -1943,7 +1946,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s for (i = 0; i < rt_count; ++i) { - unsigned int blend_idx = desc->BlendState.IndependentBlendEnable ? i : 0; + const D3D12_RENDER_TARGET_BLEND_DESC *rt_desc; size_t idx = graphics->rt_idx + i; if (!(format = vkd3d_get_format(desc->RTVFormats[i], false))) @@ -1953,6 +1956,20 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } + rt_desc = &desc->BlendState.RenderTarget[desc->BlendState.IndependentBlendEnable ? i : 0]; + if (desc->BlendState.IndependentBlendEnable && rt_desc->LogicOpEnable) + { + WARN("IndependentBlendEnable must be FALSE when logic operations are enabled.\n"); + hr = E_INVALIDARG; + goto fail; + } + if (rt_desc->BlendEnable && rt_desc->LogicOpEnable) + { + WARN("Only one of BlendEnable or LogicOpEnable can be set to TRUE."); + hr = E_INVALIDARG; + goto fail; + } + ps_output_swizzle[i] = vkd3d_get_rt_format_swizzle(format); graphics->attachments[idx].flags = 0; @@ -1968,7 +1985,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->attachment_references[idx].attachment = idx; graphics->attachment_references[idx].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - blend_attachment_from_d3d12(&graphics->blend_attachments[i], &desc->BlendState.RenderTarget[blend_idx]); + blend_attachment_from_d3d12(&graphics->blend_attachments[i], rt_desc); } graphics->attachment_count = graphics->rt_idx + rt_count; @@ -1983,8 +2000,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_interface.uav_counters = NULL; shader_interface.uav_counter_count = 0; - memset(&input_signature, 0, sizeof(input_signature)); - for (i = 0, graphics->stage_count = 0; i < ARRAY_SIZE(shader_stages); ++i) + for (i = 0; i < ARRAY_SIZE(shader_stages); ++i) { const D3D12_SHADER_BYTECODE *b = (const void *)((uintptr_t)desc + shader_stages[i].offset); const struct vkd3d_shader_code dxbc = {b->pShaderBytecode, b->BytecodeLength};

1 0

Józef Kucia : tests: Add test for creating graphics pipelines.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: vkd3d Branch: master Commit: 6e029296ec3d57fd446e306572255e4ece8618c1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6e029296ec3d57fd446e306… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 23 18:33:06 2018 +0200 tests: Add test for creating graphics pipelines. 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 | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 110 insertions(+), 5 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index cf51ab9..eefef3b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2268,7 +2268,7 @@ static void test_root_signature_limits(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } -static void test_create_pipeline_state(void) +static void test_create_compute_pipeline_state(void) { D3D12_COMPUTE_PIPELINE_STATE_DESC pipeline_state_desc; D3D12_ROOT_SIGNATURE_DESC root_signature_desc; @@ -2302,7 +2302,7 @@ static void test_create_pipeline_state(void) root_signature_desc.pStaticSamplers = NULL; root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; hr = create_root_signature(device, &root_signature_desc, &root_signature); - ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); refcount = get_refcount(device); ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); @@ -2315,7 +2315,7 @@ static void test_create_pipeline_state(void) hr = ID3D12Device_CreateComputePipelineState(device, &pipeline_state_desc, &IID_ID3D12PipelineState, (void **)&pipeline_state); - ok(SUCCEEDED(hr), "Failed to create compute pipeline, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create compute pipeline, hr %#x.\n", hr); refcount = get_refcount(root_signature); ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount); @@ -2323,7 +2323,7 @@ static void test_create_pipeline_state(void) refcount = get_refcount(device); ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); hr = ID3D12PipelineState_GetDevice(pipeline_state, &IID_ID3D12Device, (void **)&tmp_device); - ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); refcount = get_refcount(device); ok(refcount == 4, "Got unexpected refcount %u.\n", (unsigned int)refcount); refcount = ID3D12Device_Release(tmp_device); @@ -2343,6 +2343,110 @@ static void test_create_pipeline_state(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_create_graphics_pipeline_state(void) +{ + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12RootSignature *root_signature; + ID3D12PipelineState *pipeline_state; + ID3D12Device *device, *tmp_device; + D3D12_BLEND_DESC *blend; + ULONG refcount; + unsigned int i; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + root_signature_desc.NumParameters = 0; + root_signature_desc.pParameters = NULL; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + refcount = get_refcount(device); + ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); + + init_pipeline_state_desc(&pso_desc, root_signature, DXGI_FORMAT_R8G8B8A8_UNORM, NULL, NULL, NULL); + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + + refcount = get_refcount(root_signature); + ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount); + + refcount = get_refcount(device); + ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); + hr = ID3D12PipelineState_GetDevice(pipeline_state, &IID_ID3D12Device, (void **)&tmp_device); + ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); + refcount = get_refcount(device); + ok(refcount == 4, "Got unexpected refcount %u.\n", (unsigned int)refcount); + refcount = ID3D12Device_Release(tmp_device); + ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); + + check_interface(pipeline_state, &IID_ID3D12Object, TRUE); + check_interface(pipeline_state, &IID_ID3D12DeviceChild, TRUE); + check_interface(pipeline_state, &IID_ID3D12Pageable, TRUE); + check_interface(pipeline_state, &IID_ID3D12PipelineState, TRUE); + + refcount = ID3D12PipelineState_Release(pipeline_state); + ok(!refcount, "ID3D12PipelineState has %u references left.\n", (unsigned int)refcount); + + blend = &pso_desc.BlendState; + blend->IndependentBlendEnable = FALSE; + blend->RenderTarget[0].BlendEnable = TRUE; + blend->RenderTarget[0].SrcBlend = D3D12_BLEND_SRC_COLOR; + blend->RenderTarget[0].DestBlend = D3D12_BLEND_DEST_COLOR; + blend->RenderTarget[0].BlendOp = D3D12_BLEND_OP_ADD; + blend->RenderTarget[0].SrcBlendAlpha = D3D12_BLEND_SRC_ALPHA; + blend->RenderTarget[0].DestBlendAlpha = D3D12_BLEND_DEST_ALPHA; + blend->RenderTarget[0].BlendOpAlpha = D3D12_BLEND_OP_ADD; + blend->RenderTarget[0].RenderTargetWriteMask = D3D12_COLOR_WRITE_ENABLE_ALL; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + ID3D12PipelineState_Release(pipeline_state); + + /* Only one of BlendEnable or LogicOpEnable can be set to true. */ + blend->IndependentBlendEnable = FALSE; + blend->RenderTarget[0].BlendEnable = TRUE; + blend->RenderTarget[0].LogicOpEnable = TRUE; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + pso_desc.RTVFormats[0] = DXGI_FORMAT_R32_UINT; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + blend->IndependentBlendEnable = FALSE; + blend->RenderTarget[0].BlendEnable = FALSE; + blend->RenderTarget[0].LogicOpEnable = TRUE; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + ID3D12PipelineState_Release(pipeline_state); + + /* IndependentBlendEnable must be set to false when logic operations are enabled. */ + blend->IndependentBlendEnable = TRUE; + blend->RenderTarget[0].LogicOpEnable = TRUE; + for (i = 1; i < ARRAY_SIZE(blend->RenderTarget); ++i) + blend->RenderTarget[i] = blend->RenderTarget[0]; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + refcount = ID3D12RootSignature_Release(root_signature); + ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_create_fence(void) { ID3D12Device *device, *tmp_device; @@ -18238,7 +18342,8 @@ START_TEST(d3d12) run_test(test_create_unordered_access_view); run_test(test_create_root_signature); run_test(test_root_signature_limits); - run_test(test_create_pipeline_state); + run_test(test_create_compute_pipeline_state); + run_test(test_create_graphics_pipeline_state); run_test(test_create_fence); run_test(test_reset_command_allocator); run_test(test_cpu_signal_fence);

1 0

Józef Kucia : vkd3d: Do not store VkPipelineInputAssemblyStateCreateInfo in d3d12_command_list.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: vkd3d Branch: master Commit: d26300edd994eae6a4605a2573f86d9dae94d7c5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d26300edd994eae6a4605a2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 23 18:33:05 2018 +0200 vkd3d: Do not store VkPipelineInputAssemblyStateCreateInfo in d3d12_command_list. 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 | 17 ++++++++++------- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 39b0d18..3c254c0 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1695,6 +1695,7 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list struct VkVertexInputBindingDescription bindings[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; struct VkPipelineVertexInputStateCreateInfo input_desc; + struct VkPipelineInputAssemblyStateCreateInfo ia_desc; struct VkPipelineColorBlendStateCreateInfo blend_desc; struct VkGraphicsPipelineCreateInfo pipeline_desc; const struct d3d12_device *device = list->device; @@ -1776,6 +1777,12 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list input_desc.vertexAttributeDescriptionCount = state->attribute_count; input_desc.pVertexAttributeDescriptions = state->attributes; + ia_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; + ia_desc.pNext = NULL; + ia_desc.flags = 0; + ia_desc.topology = list->primitive_topology; + ia_desc.primitiveRestartEnable = VK_FALSE; + blend_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; blend_desc.pNext = NULL; blend_desc.flags = 0; @@ -1795,7 +1802,7 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list pipeline_desc.stageCount = state->stage_count; pipeline_desc.pStages = state->stages; pipeline_desc.pVertexInputState = &input_desc; - pipeline_desc.pInputAssemblyState = &list->ia_desc; + pipeline_desc.pInputAssemblyState = &ia_desc; pipeline_desc.pTessellationState = NULL; pipeline_desc.pViewportState = &vp_desc; pipeline_desc.pRasterizationState = &state->rs_desc; @@ -2806,7 +2813,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetPrimitiveTopology(ID3D12Gr TRACE("iface %p, topology %#x.\n", iface, topology); - list->ia_desc.topology = vk_topology_from_d3d12_topology(topology); + list->primitive_topology = vk_topology_from_d3d12_topology(topology); d3d12_command_list_invalidate_current_pipeline(list); } @@ -4151,11 +4158,7 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d list->pipeline_state = initial_pipeline_state; memset(list->strides, 0, sizeof(list->strides)); - list->ia_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; - list->ia_desc.pNext = NULL; - list->ia_desc.flags = 0; - list->ia_desc.topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST; - list->ia_desc.primitiveRestartEnable = VK_FALSE; + list->primitive_topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST; memset(list->views, 0, sizeof(list->views)); list->fb_width = 0; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9b5d5db..df44447 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -615,7 +615,7 @@ struct d3d12_command_list bool is_valid; uint32_t strides[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; - struct VkPipelineInputAssemblyStateCreateInfo ia_desc; + VkPrimitiveTopology primitive_topology; VkImageView views[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; unsigned int fb_width;

1 0

Józef Kucia : vkd3d: Avoid passing vkd3d_vk_device_procs to helper functions.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: vkd3d Branch: master Commit: acc658a912c0ad87c53df4909692ee17687638b5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=acc658a912c0ad87c53df49… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 23 18:33:04 2018 +0200 vkd3d: Avoid passing vkd3d_vk_device_procs to helper functions. 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 | 94 +++++++++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=acc658a912c0ad87c53…

1 0

Józef Kucia : vkd3d: Try to call vkCmdCopyQueryPoolResults() for multiple queries.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: vkd3d Branch: master Commit: 4cfd3a425f906fec2c315e2a84ebd6db5325875f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4cfd3a425f906fec2c315e2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 23 18:33:03 2018 +0200 vkd3d: Try to call vkCmdCopyQueryPoolResults() for multiple queries. 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 | 47 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 793417e..aa77c6c 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3885,8 +3885,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); struct d3d12_resource *buffer = unsafe_impl_from_ID3D12Resource(dst_buffer); const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; - VkDeviceSize stride = sizeof(uint64_t); - unsigned int i; + VkDeviceSize offset, stride = sizeof(uint64_t); + unsigned int i, first, count; TRACE("iface %p, heap %p, type %#x, start_index %u, query_count %u, " "dst_buffer %p, aligned_dst_buffer_offset %#"PRIx64".\n", @@ -3914,26 +3914,45 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics if (type == D3D12_QUERY_TYPE_PIPELINE_STATISTICS) stride = sizeof(struct D3D12_QUERY_DATA_PIPELINE_STATISTICS); - /* We cannot copy query results if a query was not issued: - * - * "If the query does not become available in a finite amount of time - * (e.g. due to not issuing a query since the last reset), - * a VK_ERROR_DEVICE_LOST error may occur." - */ + count = 0; + first = start_index; + offset = aligned_dst_buffer_offset; for (i = 0; i < query_count; ++i) { - const UINT64 offset = aligned_dst_buffer_offset + i * stride; - const unsigned int query_index = start_index + i; - - if (!d3d12_query_heap_is_result_available(query_heap, query_index)) + if (d3d12_query_heap_is_result_available(query_heap, start_index + i)) + { + ++count; + } + else { + if (count) + { + VK_CALL(vkCmdCopyQueryPoolResults(list->vk_command_buffer, + query_heap->vk_query_pool, first, count, buffer->u.vk_buffer, + offset, stride, VK_QUERY_RESULT_64_BIT | VK_QUERY_RESULT_WAIT_BIT)); + } + count = 0; + first = start_index + i; + offset = aligned_dst_buffer_offset + i * stride; + + /* We cannot copy query results if a query was not issued: + * + * "If the query does not become available in a finite amount of + * time (e.g. due to not issuing a query since the last reset), + * a VK_ERROR_DEVICE_LOST error may occur." + */ VK_CALL(vkCmdFillBuffer(list->vk_command_buffer, buffer->u.vk_buffer, offset, stride, 0x00000000)); - continue; + + ++first; + offset += stride; } + } + if (count) + { VK_CALL(vkCmdCopyQueryPoolResults(list->vk_command_buffer, - query_heap->vk_query_pool, query_index, 1, buffer->u.vk_buffer, + query_heap->vk_query_pool, first, count, buffer->u.vk_buffer, offset, stride, VK_QUERY_RESULT_64_BIT | VK_QUERY_RESULT_WAIT_BIT)); } }

1 0

Józef Kucia : vkd3d: Simplify d3d12_command_list_IASetVertexBuffers().
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: vkd3d Branch: master Commit: 71e633cb1b1b77ec2518e2a867f0fe9283fb0833 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=71e633cb1b1b77ec2518e2a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 23 18:33:02 2018 +0200 vkd3d: Simplify d3d12_command_list_IASetVertexBuffers(). 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 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index cb50d63..793417e 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3477,8 +3477,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi return; } + count = 0; first = start_slot; - for (i = 0, count = 0; i < view_count; ++i) + for (i = 0; i < view_count; ++i) { if (views[i].BufferLocation) { @@ -3492,12 +3493,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi { if (count) VK_CALL(vkCmdBindVertexBuffers(list->vk_command_buffer, first, count, buffers, offsets)); + count = 0; + first = start_slot + i + 1; stride = 0; - ++count; - - first += count; - count = 0; } invalidate |= list->strides[start_slot + i] != stride;

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
62
Older →

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 August 2018