December 2018 - Wine-Devel - list.winehq.org

[PATCH] testbot: Add a dir option to specify the directory on Wine missions.
by Francois Gouget Dec. 3, 2018

Dec. 3, 2018

This allows running the tests in a regular directory, in the root of a drive or on a non-c: drive. By default the tests are now run in the root of the wineprefix's c: drive. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 3 ++- testbot/bin/WineRunWineTest.pl | 6 +++--- testbot/bin/build/WineTest.pl | 20 +++++++++++--------- testbot/lib/Build/Utils.pm | 29 +++++++++++++++++++++++------ testbot/web/admin/VMDetails.pl | 1 + 5 files changed, 40 insertions(+), 19 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index f61ee65e7e..c903ae3695 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -47,6 +47,7 @@ use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::LogUtils; use WineTestBot::Missions; +use WineTestBot::Utils; use WineTestBot::Engine::Notify; @@ -346,7 +347,7 @@ my $Script = $VM->Type eq "wine" ? "WineReconfig.pl" : "Reconfig.pl"; $Script = "#!/bin/sh\n". "( set -x\n". " git pull &&\n". - " ../bin/build/$Script ". MergeMissionStatementTasks($Task->Missions) ."\n". + " ../bin/build/$Script ". ShQuote(MergeMissionStatementTasks($Task->Missions)) ."\n". ") >Reconfig.log 2>&1\n"; my $TA = $VM->GetAgent(); Debug(Elapsed($Start), " Sending the script: [$Script]\n"); diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 19e3e8f3eb..5ce1448eb0 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -439,7 +439,7 @@ $Script .= " ../bin/build/WineTest.pl "; if ($Step->Type eq "suite") { my $BaseTag = BuildTag($VM->Name); - $Script .= "--winetest ". $Task->Missions ." $BaseTag "; + $Script .= "--winetest ". ShQuote($Task->Missions) ." $BaseTag "; if (defined $WebHostName) { my $StepTask = 100 * $StepNo + $TaskNo; @@ -455,11 +455,11 @@ if ($Step->Type eq "suite") } elsif ($Step->FileType eq "patch") { - $Script .= "--testpatch ". $Task->Missions ." patch.diff"; + $Script .= "--testpatch ". ShQuote($Task->Missions) ." patch.diff"; } else { - $Script .= join(" ", "--testexe", $Task->Missions, $FileName, $Task->CmdLineArg); + $Script .= join(" ", "--testexe", ShQuote($Task->Missions), $FileName, $Task->CmdLineArg); } $Script .= "\n) >Task.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index b7389ba25e..b47a6bf0fc 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -99,9 +99,9 @@ sub DailyWineTest($$$$) # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. my $Tag = SanitizeTag("$BaseTag-$BaseName"); - RunWine($Mission, "./programs/winetest/winetest.exe.so", - "-c -o '../$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); - if (!-f "$BaseName.report") + RunWine($Mission, "programs/winetest/winetest.exe.so", + "-c -o '$DataDir/$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); + if (!-f "$DataDir/$BaseName.report") { LogMsg "WineTest did not produce the $BaseName report\n"; return 0; @@ -109,8 +109,8 @@ sub DailyWineTest($$$$) # Send the report to the website if ((!$NoSubmit and !$Mission->{nosubmit}) and - RunWine($Mission, "./programs/winetest/winetest.exe.so", - "-c -s '../$BaseName.report'")) + RunWine($Mission, "programs/winetest/winetest.exe.so", + "-c -s '$DataDir/$BaseName.report'")) { LogMsg "WineTest failed to send the $BaseName report\n"; # Soldier on in case it's just a network issue @@ -168,10 +168,10 @@ sub TestPatch($$) # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. - RunWine($Mission, "./programs/winetest/winetest.exe.so", - "-c -o '../$BaseName.report' -t do.not.submit ". + RunWine($Mission, "programs/winetest/winetest.exe.so", + "-c -o '$DataDir/$BaseName.report' -t do.not.submit ". join(" ", @TestList)); - if (!-f "$BaseName.report") + if (!-f "$DataDir/$BaseName.report") { LogMsg "WineTest did not produce the $BaseName report\n"; return 0; @@ -197,7 +197,9 @@ sub TestExe($$$) } # Run the test executable - RunWine($Mission, "./TestLauncher.exe.so", "-t 120 ". ShArgv2Cmd($FileName, @$Args) ." >'../$BaseName.report'"); + RunWine($Mission, "TestLauncher.exe.so", + "-t 120 ". ShArgv2Cmd($FileName, @$Args) + ." >'$DataDir/$BaseName.report'"); return 1; } diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index c53f6099c5..b204386827 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -348,10 +348,26 @@ sub RunWine($$$) { my ($Mission, $Cmd, $CmdArgs) = @_; - my $Magic = `cd '$DataDir/wine-$Mission->{Build}' && file $Cmd`; - my $Wine = ($Magic =~ /ELF 64/ ? "./wine64" : "./wine"); - return system("cd '$DataDir/wine-$Mission->{Build}' && set -x && ". - "time $Wine $Cmd $CmdArgs"); + my $WineDir = "$DataDir/wine-$Mission->{Build}"; + $Cmd = "$WineDir/$Cmd" if ($Cmd =~ /\.exe\.so$/); + + my $CurDir = "$ENV{WINEPREFIX}/dosdevices"; + if (!-d $CurDir) + { + $CurDir = "."; + } + else + { + my $Dir = $Mission->{dir} || ""; + # We cannot put colons in missions so restore the drive letter + $Dir = "$CurDir/c:/$Dir" if ($Dir !~ s~^([a-z])/~$CurDir/$1:/~); + $CurDir = -d $Dir ? $Dir : "$ENV{WINEPREFIX}/dosdevices/c:"; + } + + my $Magic = `file '$Cmd'`; + my $Wine = ($Magic =~ /ELF 64/ ? "$WineDir/wine64" : "$WineDir/wine"); + return system("set -x && cd '$CurDir' && ". + "time '$Wine' '$Cmd' $CmdArgs"); } @@ -367,7 +383,7 @@ sub CreateWinePrefix($;$) rmtree($ENV{WINEPREFIX}); # Crash dialogs cause delays so disable them - if (RunWine($Mission, "./programs/reg/reg.exe.so", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) + if (RunWine($Mission, "programs/reg/reg.exe.so", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) { return "Failed to disable the crash dialogs: $!"; } @@ -376,7 +392,8 @@ sub CreateWinePrefix($;$) { # Ensure the WinePrefix has been fully created and the registry files # saved before returning. - system("cd '$DataDir/wine-$Mission->{Build}' && ./server/wineserver -w"); + my $WineDir = "$DataDir/wine-$Mission->{Build}"; + system("'$WineDir/server/wineserver' -w"); } return undef; diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 4dd9e2501a..095de3a1eb 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -80,6 +80,7 @@ sub GenerateFooter($) print "On Wine VMs: \n"; print "The test option can be set to build to only test building, test to only rerun patched tests, module to rerun all of a patched dll or program's tests, or all to always rerun all the tests. \n"; print "The lang option can be set to run the tests in the specified \$LANG locale. The default is en_US (.UTF-8 can be omitted). \n"; + print "The dir option can be set to specify the directory in which to run the tests. A path starting with a single letter followed by a slash specifies the drive, for instance 'c/' for 'c:' (the default). \n"; print "If set, the nosubmit option specifies that the WineTest results should not be published online.\n"; print "</td></tr></tbody>\n"; print "</table></div>\n"; -- 2.19.2

1 0

[PATCH 2/2] include: Add ntddvdeo.h.
by Józef Kucia Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/ntddvdeo.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 include/ntddvdeo.h diff --git a/include/ntddvdeo.h b/include/ntddvdeo.h new file mode 100644 index 000000000000..d79670c4566a --- /dev/null +++ b/include/ntddvdeo.h @@ -0,0 +1,24 @@ +/* + * Copyright 2018 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_NTDDVDEO_H +#define __WINE_NTDDVDEO_H + +DEFINE_GUID(GUID_DEVINTERFACE_DISPLAY_ADAPTER, 0x5b45201d, 0xf2f2, 0x4f3b, 0x85, 0xbb, 0x30, 0xff, 0x1f, 0x95, 0x35, 0x99); + +#endif -- 2.18.1

1 0

[PATCH vkd3d 6/6] vkd3d: Implement D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED.
by Józef Kucia Dec. 3, 2018

Dec. 3, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 59 +++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 2e6357ac3c3f..937c7e37fc49 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2251,6 +2251,34 @@ static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list return true; } +static void d3d12_command_list_check_index_buffer_strip_cut_value(struct d3d12_command_list *list) +{ + struct d3d12_graphics_pipeline_state *graphics = &list->state->u.graphics; + + /* In Vulkan, the strip cut value is derived from the index buffer format. */ + switch (graphics->index_buffer_strip_cut_value) + { + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: + if (list->index_buffer_format != DXGI_FORMAT_R16_UINT) + { + FIXME("Strip cut value 0xffff is not supported with index buffer format %#x.\n", + list->index_buffer_format); + } + break; + + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: + if (list->index_buffer_format != DXGI_FORMAT_R32_UINT) + { + FIXME("Strip cut value 0xffffffff is not supported with index buffer format %#x.\n", + list->index_buffer_format); + } + break; + + default: + break; + } +} + static void STDMETHODCALLTYPE d3d12_command_list_DrawInstanced(ID3D12GraphicsCommandList *iface, UINT vertex_count_per_instance, UINT instance_count, UINT start_vertex_location, UINT start_instance_location) @@ -2287,27 +2315,15 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12Grap iface, index_count_per_instance, instance_count, start_vertex_location, base_vertex_location, start_instance_location); - vk_procs = &list->device->vk_procs; - if (!d3d12_command_list_begin_render_pass(list)) { WARN("Failed to begin render pass, ignoring draw call.\n"); return; } - switch (list->state->u.graphics.index_buffer_strip_cut_value) - { - case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: - if (list->index_buffer_format != DXGI_FORMAT_R16_UINT) - FIXME("Strip cut value 0xffff is not supported with index buffer format %#x.\n", list->index_buffer_format); - break; - case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: - if (list->index_buffer_format != DXGI_FORMAT_R32_UINT) - FIXME("Strip cut value 0xffffffff is not supported with index buffer format %#x.\n", list->index_buffer_format); - break; - default: - break; - } + vk_procs = &list->device->vk_procs; + + d3d12_command_list_check_index_buffer_strip_cut_value(list); VK_CALL(vkCmdDrawIndexed(list->vk_command_buffer, index_count_per_instance, instance_count, start_vertex_location, base_vertex_location, start_instance_location)); @@ -4113,6 +4129,19 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC arg_buffer_offset, max_command_count, signature_desc->ByteStride)); break; + case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED: + if (!d3d12_command_list_begin_render_pass(list)) + { + WARN("Failed to begin render pass, ignoring draw.\n"); + break; + } + + d3d12_command_list_check_index_buffer_strip_cut_value(list); + + VK_CALL(vkCmdDrawIndexedIndirect(list->vk_command_buffer, arg_impl->u.vk_buffer, + arg_buffer_offset, max_command_count, signature_desc->ByteStride)); + break; + case D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH: if (max_command_count != 1) FIXME("Ignoring command count %u.\n", max_command_count); -- 2.18.1

2 1

[PATCH vkd3d 5/6] vkd3d: Add FIXME() for unsupported strip cut values.
by Józef Kucia Dec. 3, 2018

Dec. 3, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> In Vulkan, the strip cut value is derived from the current index buffer format. We could recompile the pipeline to handle more cases. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 18 ++++++++++++++++++ libs/vkd3d/state.c | 6 ++---- libs/vkd3d/vkd3d_private.h | 4 +++- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3d5e898b4adb..2e6357ac3c3f 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1703,6 +1703,8 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, memset(list->strides, 0, sizeof(list->strides)); list->primitive_topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST; + list->index_buffer_format = DXGI_FORMAT_UNKNOWN; + memset(list->views, 0, sizeof(list->views)); list->fb_width = 0; list->fb_height = 0; @@ -2293,6 +2295,20 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12Grap return; } + switch (list->state->u.graphics.index_buffer_strip_cut_value) + { + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: + if (list->index_buffer_format != DXGI_FORMAT_R16_UINT) + FIXME("Strip cut value 0xffff is not supported with index buffer format %#x.\n", list->index_buffer_format); + break; + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: + if (list->index_buffer_format != DXGI_FORMAT_R32_UINT) + FIXME("Strip cut value 0xffffffff is not supported with index buffer format %#x.\n", list->index_buffer_format); + break; + default: + break; + } + VK_CALL(vkCmdDrawIndexed(list->vk_command_buffer, index_count_per_instance, instance_count, start_vertex_location, base_vertex_location, start_instance_location)); } @@ -3475,6 +3491,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetIndexBuffer(ID3D12Graphics return; } + list->index_buffer_format = view->Format; + resource = vkd3d_gpu_va_allocator_dereference(&list->device->gpu_va_allocator, view->BufferLocation); VK_CALL(vkCmdBindIndexBuffer(list->vk_command_buffer, resource->u.vk_buffer, view->BufferLocation - resource->gpu_address, index_type)); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 03d8ef35ffd2..64c21588a825 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2236,11 +2236,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s switch (desc->IBStripCutValue) { case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED: - graphics->primitive_restart_enable = VK_FALSE; - break; case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: - graphics->primitive_restart_enable = VK_TRUE; + graphics->index_buffer_strip_cut_value = desc->IBStripCutValue; break; default: WARN("Invalid index buffer strip cut value %#x.\n", desc->IBStripCutValue); @@ -2506,7 +2504,7 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta ia_desc.pNext = NULL; ia_desc.flags = 0; ia_desc.topology = topology; - ia_desc.primitiveRestartEnable = graphics->primitive_restart_enable; + ia_desc.primitiveRestartEnable = !!graphics->index_buffer_strip_cut_value; blend_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; blend_desc.pNext = NULL; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index f97755925888..7e04dc31a0c8 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -531,7 +531,7 @@ struct d3d12_graphics_pipeline_state size_t attachment_count, rt_idx; VkRenderPass render_pass; - VkBool32 primitive_restart_enable; + D3D12_INDEX_BUFFER_STRIP_CUT_VALUE index_buffer_strip_cut_value; struct VkPipelineRasterizationStateCreateInfo rs_desc; struct VkPipelineMultisampleStateCreateInfo ms_desc; struct VkPipelineDepthStencilStateCreateInfo ds_desc; @@ -696,6 +696,8 @@ struct d3d12_command_list uint32_t strides[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; VkPrimitiveTopology primitive_topology; + DXGI_FORMAT index_buffer_format; + VkImageView views[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; unsigned int fb_width; unsigned int fb_height; -- 2.18.1

2 1

[PATCH vkd3d 4/6] tests: Add test for primitive restart.
by Józef Kucia Dec. 3, 2018

Dec. 3, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 172 +++++++++++++++++++++++++++++++++++++++ tests/d3d12_test_utils.h | 1 + 2 files changed, 173 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index e9dbbaa8c3ba..7ad0303985be 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21914,6 +21914,177 @@ static void test_multisample_rendering(void) destroy_test_context(&context); } +static void test_primitive_restart(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_INPUT_LAYOUT_DESC input_layout; + struct test_context_desc desc; + D3D12_VERTEX_BUFFER_VIEW vbv; + struct test_context context; + D3D12_INDEX_BUFFER_VIEW ibv; + struct resource_readback rb; + ID3D12CommandQueue *queue; + unsigned int index_count; + ID3D12Resource *ib, *vb; + size_t buffer_size; + unsigned int i; + D3D12_BOX box; + HRESULT hr; + void *ptr; + + static const DWORD vs_code[] = + { +#if 0 + float4 main(int4 p : POSITION) : SV_Position + { + return p; + } +#endif + 0x43425844, 0x3fd50ab1, 0x580a1d14, 0x28f5f602, 0xd1083e3a, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x0500002b, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const struct + { + int8_t x, y; + } + quad[] = + { + {-1, -1}, + {-1, 1}, + { 1, -1}, + { 1, 1}, + }; + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"position", 0, DXGI_FORMAT_R8G8_SINT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const uint16_t indices16[] = {0, 1, 2, 3}; + static const uint32_t indices[] = {0, 1, 2, 3}; + static const uint16_t indices16_max[] = {0, 1, 2, 0xffff}; + static const uint32_t indices_max16[] = {0, 1, 2, 0xffff}; + static const uint16_t indices16_restart[] = {0, 1, 2, 0xffff, 2, 1, 3}; + static const uint32_t indices_restart[] = {0, 1, 2, 0xffffffff, 2, 1, 3}; + static const struct + { + D3D12_INDEX_BUFFER_STRIP_CUT_VALUE strip_cut_value; + DXGI_FORMAT ib_format; + const void *indices; + size_t indices_size; + unsigned int last_index; + bool full_quad; + bool is_todo; + } + tests[] = + { + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R16_UINT, indices16, sizeof(indices16), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R16_UINT, indices16_max, sizeof(indices16_max), 0xffff, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R32_UINT, indices, sizeof(indices), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R32_UINT, indices_max16, sizeof(indices_max16), 0xffff, true}, + + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R16_UINT, indices16, sizeof(indices16), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R16_UINT, indices16_max, sizeof(indices16_max), 0xffff, false}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R16_UINT, indices16_restart, sizeof(indices16_restart), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R32_UINT, indices, sizeof(indices), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R32_UINT, indices_max16, sizeof(indices_max16), 0xffff, false, true}, + + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R16_UINT, indices16, sizeof(indices16), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R16_UINT, indices16_max, sizeof(indices16_max), 0xffff, true, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R32_UINT, indices, sizeof(indices), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R32_UINT, indices_max16, sizeof(indices_max16), 0xffff, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R32_UINT, indices_restart, sizeof(indices_restart), 0x0003, true}, + }; + + 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); + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, &vs, NULL, &input_layout); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + buffer_size = (tests[i].last_index + 1) * sizeof(*quad); + + vb = create_upload_buffer(context.device, buffer_size, NULL); + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); + vbv.StrideInBytes = sizeof(*quad); + vbv.SizeInBytes = buffer_size; + + pso_desc.IBStripCutValue = tests[i].strip_cut_value; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + + ibv.Format = tests[i].ib_format; + ib = create_upload_buffer(context.device, tests[i].indices_size, tests[i].indices); + ibv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(ib); + ibv.SizeInBytes = tests[i].indices_size; + index_count = tests[i].indices_size / format_size(ibv.Format); + + hr = ID3D12Resource_Map(vb, 0, NULL, &ptr); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + memcpy(ptr, quad, (ARRAY_SIZE(quad) - 1) * sizeof(*quad)); + memcpy((BYTE *)ptr + tests[i].last_index * sizeof(*quad), &quad[ARRAY_SIZE(quad) - 1], sizeof(*quad)); + ID3D12Resource_Unmap(vb, 0, NULL); + + 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, 1, &vbv); + ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, &ibv); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawIndexedInstanced(command_list, index_count, 1, 0, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); + if (tests[i].full_quad) + { + todo_if(tests[i].is_todo) + check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); + } + else + { + set_box(&box, 16, 0, 0, 32, 10, 1); + todo_if(tests[i].is_todo) + check_readback_data_uint(&rb, &box, 0xffffffff, 0); + set_box(&box, 0, 16, 0, 16, 32, 1); + check_readback_data_uint(&rb, &box, 0xff00ff00, 0); + } + release_resource_readback(&rb); + + 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); + + ID3D12Resource_Release(ib); + ID3D12Resource_Release(vb); + ID3D12PipelineState_Release(context.pipeline_state); + context.pipeline_state = NULL; + } + + destroy_test_context(&context); +} + START_TEST(d3d12) { bool enable_debug_layer = false; @@ -22047,4 +22218,5 @@ START_TEST(d3d12) run_test(test_command_list_initial_pipeline_state); run_test(test_blend_factor); run_test(test_multisample_rendering); + run_test(test_primitive_restart); } diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index fc07af78ffb4..c2e7a3d50458 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -203,6 +203,7 @@ static unsigned int format_size(DXGI_FORMAT format) return 4; case DXGI_FORMAT_R16_FLOAT: case DXGI_FORMAT_R16_UNORM: + case DXGI_FORMAT_R16_UINT: return 2; case DXGI_FORMAT_BC1_UNORM: case DXGI_FORMAT_BC1_UNORM_SRGB: -- 2.18.1

2 1

[PATCH vkd3d v2 1/6] tests: Print adapter info on Windows.
by Józef Kucia Dec. 3, 2018

Dec. 3, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: * Fix formatting. * Merge #ifdef blocks. --- include/vkd3d_dxgi.idl | 26 +++++++++++++++++++++++++- tests/d3d12.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_dxgi.idl b/include/vkd3d_dxgi.idl index 5b80e1f6c3f4..7e07a78dd365 100644 --- a/include/vkd3d_dxgi.idl +++ b/include/vkd3d_dxgi.idl @@ -38,7 +38,6 @@ typedef enum DXGI_MODE_ROTATION DXGI_MODE_ROTATION_ROTATE270 = 0x4, } DXGI_MODE_ROTATION; -interface IDXGIAdapter; interface IDXGIAdapter1; interface IDXGIOutput; typedef struct DXGI_SWAP_CHAIN_DESC DXGI_SWAP_CHAIN_DESC; @@ -54,6 +53,19 @@ const DXGI_USAGE DXGI_USAGE_READ_ONLY = 0x00000100ul; const DXGI_USAGE DXGI_USAGE_DISCARD_ON_PRESENT = 0x00000200ul; const DXGI_USAGE DXGI_USAGE_UNORDERED_ACCESS = 0x00000400ul; +typedef struct DXGI_ADAPTER_DESC +{ + WCHAR Description[128]; + UINT VendorId; + UINT DeviceId; + UINT SubSysId; + UINT Revision; + SIZE_T DedicatedVideoMemory; + SIZE_T DedicatedSystemMemory; + SIZE_T SharedSystemMemory; + LUID AdapterLuid; +} DXGI_ADAPTER_DESC; + [ local, object, @@ -79,6 +91,18 @@ interface IDXGIDeviceSubObject : IDXGIObject HRESULT GetDevice(REFIID riid, void **device); } +[ + object, + local, + uuid(2411e7e1-12ac-4ccf-bd14-9798e8534dc0) +] +interface IDXGIAdapter : IDXGIObject +{ + HRESULT EnumOutputs(UINT output_idx, IDXGIOutput **output); + HRESULT GetDesc(DXGI_ADAPTER_DESC *desc); + HRESULT CheckInterfaceSupport(REFGUID guid, void *umd_version); +} + [ local, object, diff --git a/tests/d3d12.c b/tests/d3d12.c index e5a6249afff8..3956fbaa3b56 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -890,18 +890,41 @@ static IUnknown *create_adapter(void) return adapter; } - if (use_adapter_idx) - hr = IDXGIFactory4_EnumAdapters(factory, use_adapter_idx, (IDXGIAdapter **)&adapter); + hr = IDXGIFactory4_EnumAdapters(factory, use_adapter_idx, (IDXGIAdapter **)&adapter); IDXGIFactory4_Release(factory); if (FAILED(hr)) trace("Failed to get adapter, hr %#x.\n", hr); return adapter; } + +static void print_adapter_info(void) +{ + IDXGIAdapter *dxgi_adapter; + DXGI_ADAPTER_DESC desc; + IUnknown *adapter; + HRESULT hr; + + if (!(adapter = create_adapter())) + return; + + hr = IUnknown_QueryInterface(adapter, &IID_IDXGIAdapter, (void **)&dxgi_adapter); + ok(hr == S_OK, "Failed to query IDXGIAdapter, hr %#x.\n", hr); + IUnknown_Release(adapter); + + hr = IDXGIAdapter_GetDesc(dxgi_adapter, &desc); + ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + + trace("Adapter: %04x:%04x.\n", desc.VendorId, desc.DeviceId); + + IDXGIAdapter_Release(dxgi_adapter); +} #else static IUnknown *create_adapter(void) { return NULL; } + +static void print_adapter_info(void) {} #endif static ID3D12Device *create_device(void) @@ -21923,6 +21946,8 @@ START_TEST(d3d12) ID3D12Debug_Release(debug); } + print_adapter_info(); + run_test(test_create_device); run_test(test_node_count); run_test(test_check_feature_support); -- 2.18.1

2 1

[PATCH vkd3d 2/6] tests: Add more flexible todo() implementation.
by Józef Kucia Dec. 3, 2018

Dec. 3, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Based on wine/test.h. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_test.h | 75 +++++++++++++++++++++++------------- tests/d3d12.c | 56 +++++++++++---------------- 2 files changed, 71 insertions(+), 60 deletions(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index fd3ed1572da6..a2649dd64f76 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -32,12 +32,15 @@ static void vkd3d_test_main(int argc, char **argv); static const char *vkd3d_test_name; static const char *vkd3d_test_platform = "other"; +static void vkd3d_test_start_todo(bool is_todo); +static int vkd3d_test_loop_todo(void); +static void vkd3d_test_end_todo(void); + #define START_TEST(name) \ static const char *vkd3d_test_name = #name; \ static void vkd3d_test_main(int argc, char **argv) #define ok ok_(__LINE__) -#define todo todo_(__LINE__) #define skip skip_(__LINE__) #define trace trace_(__LINE__) @@ -73,6 +76,11 @@ static const char *vkd3d_test_platform = "other"; #define VKD3D_TEST_TRACE(args...) \ vkd3d_test_trace(vkd3d_line, args); } while (0) +#define todo_if(is_todo) \ + for (vkd3d_test_start_todo(is_todo); vkd3d_test_loop_todo(); vkd3d_test_end_todo()) + +#define todo todo_if(true) + static struct { LONG success_count; @@ -82,6 +90,9 @@ static struct LONG todo_success_count; unsigned int debug_level; + + unsigned int todo_level; + bool todo_do_loop; } vkd3d_test_state; static bool @@ -99,7 +110,24 @@ broken(bool condition) static void vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list args) { - if (result) + bool is_todo = vkd3d_test_state.todo_level && !vkd3d_test_platform_is_windows(); + + if (is_todo) + { + if (result) + { + printf("%s:%d Todo succeeded: ", vkd3d_test_name, line); + vprintf(fmt, args); + InterlockedIncrement(&vkd3d_test_state.todo_success_count); + } + else + { + printf("%s:%d: Todo: ", vkd3d_test_name, line); + vprintf(fmt, args); + InterlockedIncrement(&vkd3d_test_state.todo_count); + } + } + else if (result) { if (vkd3d_test_state.debug_level > 1) printf("%s:%d: Test succeeded.\n", vkd3d_test_name, line); @@ -123,31 +151,6 @@ vkd3d_test_ok(unsigned int line, bool result, const char *fmt, ...) va_end(args); } -static void VKD3D_PRINTF_FUNC(3, 4) VKD3D_UNUSED -vkd3d_test_todo(unsigned int line, bool result, const char *fmt, ...) -{ - va_list args; - - va_start(args, fmt); - if (vkd3d_test_platform_is_windows()) - { - vkd3d_test_check_ok(line, result, fmt, args); - } - else if (result) - { - printf("%s:%d Todo succeeded: ", vkd3d_test_name, line); - vprintf(fmt, args); - InterlockedIncrement(&vkd3d_test_state.todo_success_count); - } - else - { - printf("%s:%d: Todo: ", vkd3d_test_name, line); - vprintf(fmt, args); - InterlockedIncrement(&vkd3d_test_state.todo_count); - } - va_end(args); -} - static void VKD3D_PRINTF_FUNC(2, 3) VKD3D_UNUSED vkd3d_test_skip(unsigned int line, const char *fmt, ...) { @@ -283,6 +286,24 @@ static inline void vkd3d_run_test(const char *name, vkd3d_test_pfn test_pfn) test_pfn(); } +static inline void vkd3d_test_start_todo(bool is_todo) +{ + vkd3d_test_state.todo_level = (vkd3d_test_state.todo_level << 1) | is_todo; + vkd3d_test_state.todo_do_loop = true; +} + +static inline int vkd3d_test_loop_todo(void) +{ + bool do_loop = vkd3d_test_state.todo_do_loop; + vkd3d_test_state.todo_do_loop = false; + return do_loop; +} + +static inline void vkd3d_test_end_todo(void) +{ + vkd3d_test_state.todo_level >>= 1; +} + #define run_test(test_pfn) \ vkd3d_run_test(#test_pfn, test_pfn) diff --git a/tests/d3d12.c b/tests/d3d12.c index 3956fbaa3b56..e9dbbaa8c3ba 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1412,8 +1412,8 @@ static void test_format_support(void) memset(&format_support, 0, sizeof(format_support)); hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_SUPPORT, &format_support, sizeof(format_support)); - todo(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo(format_support.Support1 == D3D12_FORMAT_SUPPORT1_BUFFER, + todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo ok(format_support.Support1 == D3D12_FORMAT_SUPPORT1_BUFFER, "Got unexpected support1 %#x.\n", format_support.Support1); ok(!format_support.Support2 || format_support.Support2 == D3D12_FORMAT_SUPPORT2_TILED, "Got unexpected support2 %#x.\n", format_support.Support2); @@ -1792,7 +1792,7 @@ static void test_create_committed_resource(void) hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, NULL, &IID_ID3D12Resource, (void **)&resource); - todo(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ID3D12Resource_Release(resource); @@ -1835,7 +1835,7 @@ static void test_create_committed_resource(void) hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, NULL, &IID_ID3D12Resource, (void **)&resource); - todo(hr == E_INVALIDARG || broken_on_warp(true), "Got unexpected hr %#x.\n", hr); + todo ok(hr == E_INVALIDARG || broken_on_warp(true), "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ID3D12Resource_Release(resource); @@ -2487,7 +2487,7 @@ static void test_create_root_signature(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); - todo(hr == E_FAIL || hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + todo ok(hr == E_FAIL || hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ID3D12RootSignature_Release(root_signature); root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; @@ -2522,7 +2522,7 @@ static void test_create_root_signature(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); - todo(hr == E_FAIL || hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + todo ok(hr == E_FAIL || hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ID3D12RootSignature_Release(root_signature); root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_GEOMETRY; @@ -5472,7 +5472,7 @@ static void test_invalid_texture_resource_barriers(void) transition_resource_state(command_list, readback_buffer, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COMMON); hr = ID3D12GraphicsCommandList_Close(command_list); - todo(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D12CommandAllocator_Reset(command_allocator); ok(SUCCEEDED(hr), "Failed to reset command allocator, hr %#x.\n", hr); @@ -5485,7 +5485,7 @@ static void test_invalid_texture_resource_barriers(void) transition_resource_state(command_list, upload_buffer, D3D12_RESOURCE_STATE_GENERIC_READ, D3D12_RESOURCE_STATE_COMMON); hr = ID3D12GraphicsCommandList_Close(command_list); - todo(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ID3D12CommandAllocator_Release(command_allocator); ID3D12CommandQueue_Release(queue); @@ -5540,7 +5540,7 @@ static void test_device_removed_reason(void) hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc, &IID_ID3D12CommandQueue, (void **)&tmp_queue); - todo(hr == DXGI_ERROR_DEVICE_REMOVED, "Got unexpected hr %#x.\n", hr); + todo ok(hr == DXGI_ERROR_DEVICE_REMOVED, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ID3D12CommandQueue_Release(tmp_queue); @@ -9484,7 +9484,7 @@ static void test_root_signature_serialization_(unsigned int line, const DWORD *c (unsigned int)blob_buffer[0], (unsigned int)code[0]); for (i = 1; i < 5; ++i) { - todo_(line)(blob_buffer[i] == code[i], "Got checksum %#x, expected %#x at %u.\n", + todo ok_(line)(blob_buffer[i] == code[i], "Got checksum %#x, expected %#x at %u.\n", (unsigned int)blob_buffer[i], (unsigned int)code[i], i - 1); } for (; i < code_size / sizeof(DWORD); ++i) @@ -12880,7 +12880,7 @@ static void test_update_descriptor_heap_after_closing_command_list(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); value = get_readback_uint(&rb, 0, 0, 0); - todo(value == 0xff00ff00, "Got unexpected value %#x.\n", value); + todo ok(value == 0xff00ff00, "Got unexpected value %#x.\n", value); release_resource_readback(&rb); ID3D12DescriptorHeap_Release(cpu_heap); @@ -17604,17 +17604,12 @@ static void test_atomic_instructions(void) unsigned int value = get_readback_uint(&rb, j, 0, 0); unsigned int expected = test->expected_result[j]; - if (test->i.x < 0 + todo_if(test->i.x < 0 && (!strcmp(instructions[j], "atomic_imax") || !strcmp(instructions[j], "atomic_imin"))) - todo(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " - "with inputs (%u, %u), (%d), %#x (%d).\n", - i, value, value, expected, expected, instructions[j], - test->v.x, test->v.y, test->i.x, test->input[j], test->input[j]); - else - ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " - "with inputs (%u, %u), (%d), %#x (%d).\n", - i, value, value, expected, expected, instructions[j], - test->v.x, test->v.y, test->i.x, test->input[j], test->input[j]); + ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " + "with inputs (%u, %u), (%d), %#x (%d).\n", + i, value, value, expected, expected, instructions[j], + test->v.x, test->v.y, test->i.x, test->input[j], test->input[j]); } release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -17629,16 +17624,11 @@ static void test_atomic_instructions(void) unsigned int value = get_readback_uint(&rb, j, 0, 0); unsigned int expected = test->expected_result[j]; - if (test->i.x < 0 && todo_instruction) - todo(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " - "with inputs (%u, %u), (%d), %#x (%d).\n", - i, value, value, expected, expected, imm_instructions[j], - test->v.x, test->v.y, test->i.x, test->input[j], test->input[j]); - else - ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " - "with inputs (%u, %u), (%d), %#x (%d).\n", - i, value, value, expected, expected, imm_instructions[j], - test->v.x, test->v.y, test->i.x, test->input[j], test->input[j]); + todo_if(test->i.x < 0 && todo_instruction) + ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " + "with inputs (%u, %u), (%d), %#x (%d).\n", + i, value, value, expected, expected, imm_instructions[j], + test->v.x, test->v.y, test->i.x, test->input[j], test->input[j]); } release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -18008,7 +17998,7 @@ static void test_create_query_heap(void) heap_desc.NodeMask = 0; hr = ID3D12Device_CreateQueryHeap(device, &heap_desc, &IID_ID3D12QueryHeap, (void **)&query_heap); - todo(hr == S_OK, "Failed to create query heap, type %u, hr %#x.\n", heap_desc.Type, hr); + todo ok(hr == S_OK, "Failed to create query heap, type %u, hr %#x.\n", heap_desc.Type, hr); if (hr == S_OK) ID3D12QueryHeap_Release(query_heap); @@ -18516,7 +18506,7 @@ static void test_resolve_query_data_in_reordered_command_list(void) reset_command_list(command_lists[0], context.allocator); get_buffer_readback_with_command_list(readback_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_lists[0]); result = get_readback_uint64(&rb, 0, 0); - todo(result == context.render_target_desc.Width * context.render_target_desc.Height, + todo ok(result == context.render_target_desc.Width * context.render_target_desc.Height, "Got unexpected result %"PRIu64".\n", result); release_resource_readback(&rb); -- 2.18.1

2 1

[PATCH vkd3d 3/6] vkd3d: Implement primitive restart.
by Józef Kucia Dec. 3, 2018

Dec. 3, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 17 ++++++++++++++++- libs/vkd3d/vkd3d_private.h | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 1fefb6149cff..03d8ef35ffd2 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2233,6 +2233,21 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->attribute_count = j; vkd3d_shader_free_shader_signature(&input_signature); + switch (desc->IBStripCutValue) + { + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED: + graphics->primitive_restart_enable = VK_FALSE; + break; + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: + graphics->primitive_restart_enable = VK_TRUE; + break; + default: + WARN("Invalid index buffer strip cut value %#x.\n", desc->IBStripCutValue); + hr = E_INVALIDARG; + goto fail; + } + sub_pass_desc.flags = 0; sub_pass_desc.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; sub_pass_desc.inputAttachmentCount = 0; @@ -2491,7 +2506,7 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta ia_desc.pNext = NULL; ia_desc.flags = 0; ia_desc.topology = topology; - ia_desc.primitiveRestartEnable = VK_FALSE; + ia_desc.primitiveRestartEnable = graphics->primitive_restart_enable; blend_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; blend_desc.pNext = NULL; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 2fc31da08a96..f97755925888 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -531,6 +531,7 @@ struct d3d12_graphics_pipeline_state size_t attachment_count, rt_idx; VkRenderPass render_pass; + VkBool32 primitive_restart_enable; struct VkPipelineRasterizationStateCreateInfo rs_desc; struct VkPipelineMultisampleStateCreateInfo ms_desc; struct VkPipelineDepthStencilStateCreateInfo ds_desc; -- 2.18.1

2 1

[PATCH 1/2] loader: Move some code in preparation for adding the Mac preloader.
by Ken Thomases Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- This is a no-op. It justs makes the next patch simpler. loader/preloader.c | 288 +++++++++++++++++++++++++++-------------------------- 1 file changed, 148 insertions(+), 140 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 644244b..de15130 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -93,6 +93,14 @@ #include "main.h" +static int wld_vsprintf(char *buffer, const char *fmt, va_list args ); + +static __attribute__((format(printf,1,2))) void wld_printf(const char *fmt, ... ); + +static __attribute__((noreturn,format(printf,1,2))) void fatal_error(const char *fmt, ... ); + +static void preload_reserve( const char *str ); + /* ELF definitions */ #define ELF_PREFERRED_ADDRESS(loader, maplength, mapstartpref) (mapstartpref) #define ELF_FIXED_ADDRESS(loader, mapstart) ((void) 0) @@ -559,85 +567,6 @@ static inline void *wld_memset( void *dest, int val, size_t len ) return dest; } -/* - * wld_printf - just the basics - * - * %x prints a hex number - * %s prints a string - * %p prints a pointer - */ -static int wld_vsprintf(char *buffer, const char *fmt, va_list args ) -{ - static const char hex_chars[16] = "0123456789abcdef"; - const char *p = fmt; - char *str = buffer; - int i; - - while( *p ) - { - if( *p == '%' ) - { - p++; - if( *p == 'x' ) - { - unsigned int x = va_arg( args, unsigned int ); - for (i = 2*sizeof(x) - 1; i >= 0; i--) - *str++ = hex_chars[(x>>(i*4))&0xf]; - } - else if (p[0] == 'l' && p[1] == 'x') - { - unsigned long x = va_arg( args, unsigned long ); - for (i = 2*sizeof(x) - 1; i >= 0; i--) - *str++ = hex_chars[(x>>(i*4))&0xf]; - p++; - } - else if( *p == 'p' ) - { - unsigned long x = (unsigned long)va_arg( args, void * ); - for (i = 2*sizeof(x) - 1; i >= 0; i--) - *str++ = hex_chars[(x>>(i*4))&0xf]; - } - else if( *p == 's' ) - { - char *s = va_arg( args, char * ); - while(*s) - *str++ = *s++; - } - else if( *p == 0 ) - break; - p++; - } - *str++ = *p++; - } - *str = 0; - return str - buffer; -} - -static __attribute__((format(printf,1,2))) void wld_printf(const char *fmt, ... ) -{ - va_list args; - char buffer[256]; - int len; - - va_start( args, fmt ); - len = wld_vsprintf(buffer, fmt, args ); - va_end( args ); - wld_write(2, buffer, len); -} - -static __attribute__((noreturn,format(printf,1,2))) void fatal_error(const char *fmt, ... ) -{ - va_list args; - char buffer[256]; - int len; - - va_start( args, fmt ); - len = wld_vsprintf(buffer, fmt, args ); - va_end( args ); - wld_write(2, buffer, len); - wld_exit(1); -} - #ifdef DUMP_AUX_INFO /* * Dump interesting bits of the ELF auxv_t structure that is passed @@ -1120,67 +1049,6 @@ found: return (void *)(symtab[idx].st_value + map->l_addr); } -/* - * preload_reserve - * - * Reserve a range specified in string format - */ -static void preload_reserve( const char *str ) -{ - const char *p; - unsigned long result = 0; - void *start = NULL, *end = NULL; - int i, first = 1; - - for (p = str; *p; p++) - { - if (*p >= '0' && *p <= '9') result = result * 16 + *p - '0'; - else if (*p >= 'a' && *p <= 'f') result = result * 16 + *p - 'a' + 10; - else if (*p >= 'A' && *p <= 'F') result = result * 16 + *p - 'A' + 10; - else if (*p == '-') - { - if (!first) goto error; - start = (void *)(result & ~page_mask); - result = 0; - first = 0; - } - else goto error; - } - if (!first) end = (void *)((result + page_mask) & ~page_mask); - else if (result) goto error; /* single value '0' is allowed */ - - /* sanity checks */ - if (end <= start) start = end = NULL; - else if ((char *)end > preloader_start && - (char *)start <= preloader_end) - { - wld_printf( "WINEPRELOADRESERVE range %p-%p overlaps preloader %p-%p\n", - start, end, preloader_start, preloader_end ); - start = end = NULL; - } - - /* check for overlap with low memory areas */ - for (i = 0; preload_info[i].size; i++) - { - if ((char *)preload_info[i].addr > (char *)0x00110000) break; - if ((char *)end <= (char *)preload_info[i].addr + preload_info[i].size) - { - start = end = NULL; - break; - } - if ((char *)start < (char *)preload_info[i].addr + preload_info[i].size) - start = (char *)preload_info[i].addr + preload_info[i].size; - } - - while (preload_info[i].size) i++; - preload_info[i].addr = start; - preload_info[i].size = (char *)end - (char *)start; - return; - -error: - fatal_error( "invalid WINEPRELOADRESERVE value '%s'\n", str ); -} - /* check if address is in one of the reserved ranges */ static int is_addr_reserved( const void *addr ) { @@ -1374,3 +1242,143 @@ void* wld_start( void **stack ) return (void *)ld_so_map.l_entry; } + +/* + * wld_printf - just the basics + * + * %x prints a hex number + * %s prints a string + * %p prints a pointer + */ +static int wld_vsprintf(char *buffer, const char *fmt, va_list args ) +{ + static const char hex_chars[16] = "0123456789abcdef"; + const char *p = fmt; + char *str = buffer; + int i; + + while( *p ) + { + if( *p == '%' ) + { + p++; + if( *p == 'x' ) + { + unsigned int x = va_arg( args, unsigned int ); + for (i = 2*sizeof(x) - 1; i >= 0; i--) + *str++ = hex_chars[(x>>(i*4))&0xf]; + } + else if (p[0] == 'l' && p[1] == 'x') + { + unsigned long x = va_arg( args, unsigned long ); + for (i = 2*sizeof(x) - 1; i >= 0; i--) + *str++ = hex_chars[(x>>(i*4))&0xf]; + p++; + } + else if( *p == 'p' ) + { + unsigned long x = (unsigned long)va_arg( args, void * ); + for (i = 2*sizeof(x) - 1; i >= 0; i--) + *str++ = hex_chars[(x>>(i*4))&0xf]; + } + else if( *p == 's' ) + { + char *s = va_arg( args, char * ); + while(*s) + *str++ = *s++; + } + else if( *p == 0 ) + break; + p++; + } + *str++ = *p++; + } + *str = 0; + return str - buffer; +} + +static __attribute__((format(printf,1,2))) void wld_printf(const char *fmt, ... ) +{ + va_list args; + char buffer[256]; + int len; + + va_start( args, fmt ); + len = wld_vsprintf(buffer, fmt, args ); + va_end( args ); + wld_write(2, buffer, len); +} + +static __attribute__((noreturn,format(printf,1,2))) void fatal_error(const char *fmt, ... ) +{ + va_list args; + char buffer[256]; + int len; + + va_start( args, fmt ); + len = wld_vsprintf(buffer, fmt, args ); + va_end( args ); + wld_write(2, buffer, len); + wld_exit(1); +} + +/* + * preload_reserve + * + * Reserve a range specified in string format + */ +static void preload_reserve( const char *str ) +{ + const char *p; + unsigned long result = 0; + void *start = NULL, *end = NULL; + int i, first = 1; + + for (p = str; *p; p++) + { + if (*p >= '0' && *p <= '9') result = result * 16 + *p - '0'; + else if (*p >= 'a' && *p <= 'f') result = result * 16 + *p - 'a' + 10; + else if (*p >= 'A' && *p <= 'F') result = result * 16 + *p - 'A' + 10; + else if (*p == '-') + { + if (!first) goto error; + start = (void *)(result & ~page_mask); + result = 0; + first = 0; + } + else goto error; + } + if (!first) end = (void *)((result + page_mask) & ~page_mask); + else if (result) goto error; /* single value '0' is allowed */ + + /* sanity checks */ + if (end <= start) start = end = NULL; + else if ((char *)end > preloader_start && + (char *)start <= preloader_end) + { + wld_printf( "WINEPRELOADRESERVE range %p-%p overlaps preloader %p-%p\n", + start, end, preloader_start, preloader_end ); + start = end = NULL; + } + + /* check for overlap with low memory areas */ + for (i = 0; preload_info[i].size; i++) + { + if ((char *)preload_info[i].addr > (char *)0x00110000) break; + if ((char *)end <= (char *)preload_info[i].addr + preload_info[i].size) + { + start = end = NULL; + break; + } + if ((char *)start < (char *)preload_info[i].addr + preload_info[i].size) + start = (char *)preload_info[i].addr + preload_info[i].size; + } + + while (preload_info[i].size) i++; + preload_info[i].addr = start; + preload_info[i].size = (char *)end - (char *)start; + return; + +error: + fatal_error( "invalid WINEPRELOADRESERVE value '%s'\n", str ); +} -- 2.10.2

1 1

[PATCH 3/5] d3d8: Do not touch output parameters when d3d8_GetAdapterIdentifier() fails.
by Józef Kucia Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/directx.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 385c70d67166..d97882705b58 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -132,15 +132,16 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, adapter_id.device_name = NULL; /* d3d9 only */ adapter_id.device_name_size = 0; /* d3d9 only */ - hr = wined3d_get_adapter_identifier(d3d8->wined3d, adapter, flags, &adapter_id); - - identifier->DriverVersion = adapter_id.driver_version; - identifier->VendorId = adapter_id.vendor_id; - identifier->DeviceId = adapter_id.device_id; - identifier->SubSysId = adapter_id.subsystem_id; - identifier->Revision = adapter_id.revision; - memcpy(&identifier->DeviceIdentifier, &adapter_id.device_identifier, sizeof(identifier->DeviceIdentifier)); - identifier->WHQLLevel = adapter_id.whql_level; + if (SUCCEEDED(hr = wined3d_get_adapter_identifier(d3d8->wined3d, adapter, flags, &adapter_id))) + { + identifier->DriverVersion = adapter_id.driver_version; + identifier->VendorId = adapter_id.vendor_id; + identifier->DeviceId = adapter_id.device_id; + identifier->SubSysId = adapter_id.subsystem_id; + identifier->Revision = adapter_id.revision; + memcpy(&identifier->DeviceIdentifier, &adapter_id.device_identifier, sizeof(identifier->DeviceIdentifier)); + identifier->WHQLLevel = adapter_id.whql_level; + } return hr; } -- 2.18.1

3 2