March 2019 - Wine-Devel - list.winehq.org

[PATCH resend 1/6] comctl32/listbox: Handle Mouse Wheel scrolling for multi-column listboxes properly
by Gabriel Ivăncescu March 6, 2019

March 6, 2019

Multi-column listboxes scroll horizontally, so each wheel tick must go an entire page at a time instead of an item at a time. But we have to limit the amount of scrolling in this case to avoid "jumping over" columns, if the window is too small. This matches Windows behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22253 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- These notes apply to all the patches in the series. Some casts have been removed by making variables signed (with an unsigned tmp since SystemParametersInfoW expects UINT), as suggested. The calculation has been simplified to just integer arithmetic in all cases, since the division (the only operation with a fractional result) was immediately truncated to integer anyway and didn't help with overflow either, as initially assumed. As you can see, it gets assigned to cLineScroll (which is integer) and then gets multiplied as an *integer* back by WHEEL_DELTA, so if the float were to help with overflow before the division, it would overflow on the next line anyway since you apply the multiply back (but as an integer)... Anyway, overflow is extremely unlikely (and probably impossible in practice) since WHEEL_DELTA is just 120, and it was already vulnerable to overflow currently. dlls/comctl32/listbox.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index bd9cffd..2f4d4fe 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2068,9 +2068,11 @@ static LRESULT LISTBOX_HandleHScroll( LB_DESCR *descr, WORD scrollReq, WORD pos static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) { - UINT pulScrollLines = 3; + INT pulScrollLines; + UINT tmp = 3; - SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); + SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &tmp, 0); + pulScrollLines = tmp; /* if scrolling changes direction, ignore left overs */ if ((delta < 0 && descr->wheel_remain < 0) || @@ -2081,10 +2083,21 @@ static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) if (descr->wheel_remain && pulScrollLines) { - int cLineScroll; - pulScrollLines = min((UINT) descr->page_size, pulScrollLines); - cLineScroll = pulScrollLines * (float)descr->wheel_remain / WHEEL_DELTA; - descr->wheel_remain -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + INT cLineScroll; + if (descr->style & LBS_MULTICOLUMN) + { + pulScrollLines = min((UINT)descr->width / descr->column_width, pulScrollLines); + pulScrollLines = max(1U, pulScrollLines); + cLineScroll = (pulScrollLines * descr->wheel_remain) / WHEEL_DELTA; + descr->wheel_remain -= (cLineScroll * WHEEL_DELTA) / pulScrollLines; + cLineScroll *= descr->page_size; + } + else + { + pulScrollLines = min((UINT)descr->page_size, pulScrollLines); + cLineScroll = (pulScrollLines * descr->wheel_remain) / WHEEL_DELTA; + descr->wheel_remain -= (cLineScroll * WHEEL_DELTA) / pulScrollLines; + } LISTBOX_SetTopItem( descr, descr->top_item - cLineScroll, TRUE ); } return 0; -- 2.20.1

2 8

[PATCH vkd3d 05/10] vkd3d-shader: Take into account dst write mask for scalar stores.
by Józef Kucia March 6, 2019

March 6, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index de4c683ee8ae..bb74400e0d50 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2933,6 +2933,7 @@ static void vkd3d_dxbc_compiler_emit_store_scalar(struct vkd3d_dxbc_compiler *co type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); component_idx = vkd3d_write_mask_get_component_idx(write_mask); + component_idx -= vkd3d_write_mask_get_component_idx(dst_write_mask); index[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); dst_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, ptr_type_id, dst_id, index, ARRAY_SIZE(index)); } -- 2.19.2

2 1

[PATCH vkd3d 10/10] tests: Use vkd3d_test_set_context() in test_null_cbv().
by Józef Kucia March 6, 2019

March 6, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5c3f38de0033..5f869d229db3 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -15552,6 +15552,8 @@ static void test_null_cbv(void) for (index = 0; index < 1200; index += 100) { + vkd3d_test_set_context("index %u", index); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); @@ -15568,12 +15570,13 @@ static void test_null_cbv(void) transition_sub_resource_state(command_list, context.render_target, 0, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_float(context.render_target, 0, queue, command_list, 0x00000000, 0); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0); reset_command_list(command_list, context.allocator); transition_sub_resource_state(command_list, context.render_target, 0, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } + vkd3d_test_set_context(NULL); ID3D12DescriptorHeap_Release(heap); destroy_test_context(&context); -- 2.19.2

2 1

[PATCH vkd3d 09/10] tests: Add test for hull shader fork phase.
by Józef Kucia March 6, 2019

March 6, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 233 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 233 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 0e32f4067244..5c3f38de0033 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -23194,6 +23194,238 @@ static void test_hull_shader_control_point_phase(void) destroy_test_context(&context); } +static void test_hull_shader_fork_phase(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + float4 main() : SV_Position + { + return float4(-1, -1, 0, 0); + } +#endif + 0x43425844, 0x9f5f70e7, 0x57507df4, 0xbf1a4a34, 0xdb2531df, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x58454853, 0x00000040, 0x00010050, 0x00000010, + 0x0100086a, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0xbf800000, 0xbf800000, 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; +#if 0 + struct data + { + float4 position : SV_Position; + }; + + struct patch_constant_data + { + float edges[4] : SV_TessFactor; + float inside[2] : SV_InsideTessFactor; + float3 center : CENTER; + }; + + void patch_constant(OutputPatch<data, 4> control_points, + out patch_constant_data output) + { + uint i; + + output = (patch_constant_data)0; + + for (i = 0; i < 4; ++i) + { + output.edges[i] = 1.0; + } + + for (i = 0; i < 2; ++i) + { + output.inside[i] = 1.0; + } + + for (i = 0; i < 4; ++i) + { + output.center += control_points[i].position.xyz; + } + output.center /= 4; + } + + [domain("quad")] + [outputcontrolpoints(4)] + [partitioning("integer")] + [outputtopology("triangle_cw")] + [patchconstantfunc("patch_constant")] + data hs_main(InputPatch<data, 1> input, + uint i : SV_OutputControlPointID) + { + data o = (data)0; + const float4 vertices[] = + { + float4(0, 0, 0, 1), + float4(0, 2, 0, 1), + float4(2, 0, 0, 1), + float4(2, 2, 0, 1), + }; + + o.position = input[0].position + vertices[i]; + + return o; + } + + [domain("quad")] + void ds_main(patch_constant_data input, + float2 tess_coord : SV_DomainLocation, + const OutputPatch<data, 4> patch, + out float4 position : SV_Position, + out float4 color : COLOR) + { + float4 a = lerp(patch[0].position, patch[1].position, tess_coord.x); + float4 b = lerp(patch[2].position, patch[3].position, tess_coord.x); + position = lerp(a, b, tess_coord.y); + + color = float4(input.center, 1.0); + } +#endif + static const DWORD hs_code[] = + { + 0x43425844, 0xcecdcc7a, 0x1e0454ae, 0x8c490947, 0x7e33bb11, 0x00000001, 0x000005a4, 0x00000004, + 0x00000030, 0x00000064, 0x00000098, 0x0000017c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x47534350, 0x000000dc, + 0x00000007, 0x00000008, 0x000000b0, 0x00000000, 0x0000000b, 0x00000003, 0x00000000, 0x00000e01, + 0x000000be, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000010e, 0x000000b0, 0x00000001, + 0x0000000b, 0x00000003, 0x00000001, 0x00000e01, 0x000000b0, 0x00000002, 0x0000000b, 0x00000003, + 0x00000002, 0x00000e01, 0x000000b0, 0x00000003, 0x0000000b, 0x00000003, 0x00000003, 0x00000e01, + 0x000000c5, 0x00000000, 0x0000000c, 0x00000003, 0x00000004, 0x00000e01, 0x000000c5, 0x00000001, + 0x0000000c, 0x00000003, 0x00000005, 0x00000e01, 0x545f5653, 0x46737365, 0x6f746361, 0x45430072, + 0x5245544e, 0x5f565300, 0x69736e49, 0x65546564, 0x61467373, 0x726f7463, 0xababab00, 0x58454853, + 0x00000420, 0x00030050, 0x00000108, 0x01000071, 0x01000893, 0x01002094, 0x01001895, 0x01000896, + 0x01001897, 0x0100086a, 0x00001835, 0x00000012, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, + 0x3f800000, 0x00000000, 0x40000000, 0x00000000, 0x3f800000, 0x40000000, 0x00000000, 0x00000000, + 0x3f800000, 0x40000000, 0x40000000, 0x00000000, 0x01000072, 0x0200005f, 0x00016000, 0x0400005f, + 0x002010f2, 0x00000001, 0x00000000, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, + 0x04000036, 0x00100012, 0x00000000, 0x00016001, 0x06000036, 0x00100032, 0x00000000, 0x00909596, + 0x0010000a, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x3f800000, 0x08000000, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00201e46, + 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x02000099, 0x00000004, 0x0200005f, 0x00017000, + 0x04000067, 0x00102012, 0x00000000, 0x0000000b, 0x04000067, 0x00102012, 0x00000001, 0x0000000c, + 0x04000067, 0x00102012, 0x00000002, 0x0000000d, 0x04000067, 0x00102012, 0x00000003, 0x0000000e, + 0x02000068, 0x00000001, 0x0400005b, 0x00102012, 0x00000000, 0x00000004, 0x04000036, 0x00100012, + 0x00000000, 0x0001700a, 0x06000036, 0x00902012, 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, + 0x0100003e, 0x01000073, 0x02000099, 0x00000002, 0x0200005f, 0x00017000, 0x04000067, 0x00102012, + 0x00000004, 0x0000000f, 0x04000067, 0x00102012, 0x00000005, 0x00000010, 0x02000068, 0x00000001, + 0x0400005b, 0x00102012, 0x00000004, 0x00000002, 0x04000036, 0x00100012, 0x00000000, 0x0001700a, + 0x07000036, 0x00d02012, 0x00000004, 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, 0x0100003e, + 0x01000073, 0x0400005f, 0x0021a012, 0x00000004, 0x00000000, 0x03000065, 0x00102022, 0x00000000, + 0x02000068, 0x00000001, 0x09000000, 0x00100012, 0x00000000, 0x0021a00a, 0x00000001, 0x00000000, + 0x0021a00a, 0x00000000, 0x00000000, 0x08000000, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, + 0x0021a00a, 0x00000002, 0x00000000, 0x08000000, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, + 0x0021a00a, 0x00000003, 0x00000000, 0x07000038, 0x00102022, 0x00000000, 0x0010000a, 0x00000000, + 0x00004001, 0x3e800000, 0x0100003e, 0x01000073, 0x0400005f, 0x0021a022, 0x00000004, 0x00000000, + 0x03000065, 0x00102042, 0x00000000, 0x02000068, 0x00000001, 0x09000000, 0x00100012, 0x00000000, + 0x0021a01a, 0x00000001, 0x00000000, 0x0021a01a, 0x00000000, 0x00000000, 0x08000000, 0x00100012, + 0x00000000, 0x0010000a, 0x00000000, 0x0021a01a, 0x00000002, 0x00000000, 0x08000000, 0x00100012, + 0x00000000, 0x0010000a, 0x00000000, 0x0021a01a, 0x00000003, 0x00000000, 0x07000038, 0x00102042, + 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x3e800000, 0x0100003e, 0x01000073, 0x0400005f, + 0x0021a042, 0x00000004, 0x00000000, 0x03000065, 0x00102082, 0x00000000, 0x02000068, 0x00000001, + 0x09000000, 0x00100012, 0x00000000, 0x0021a02a, 0x00000001, 0x00000000, 0x0021a02a, 0x00000000, + 0x00000000, 0x08000000, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x0021a02a, 0x00000002, + 0x00000000, 0x08000000, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x0021a02a, 0x00000003, + 0x00000000, 0x07000038, 0x00102082, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x3e800000, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)}; + static const DWORD ds_code[] = + { + 0x43425844, 0x6a721eb5, 0xa3ba6439, 0x3f31e765, 0x07e272c6, 0x00000001, 0x00000304, 0x00000004, + 0x00000030, 0x00000064, 0x00000148, 0x0000019c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x47534350, 0x000000dc, 0x00000007, 0x00000008, 0x000000b0, 0x00000000, 0x0000000b, + 0x00000003, 0x00000000, 0x00000001, 0x000000be, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x00000e0e, 0x000000b0, 0x00000001, 0x0000000b, 0x00000003, 0x00000001, 0x00000001, 0x000000b0, + 0x00000002, 0x0000000b, 0x00000003, 0x00000002, 0x00000001, 0x000000b0, 0x00000003, 0x0000000b, + 0x00000003, 0x00000003, 0x00000001, 0x000000c5, 0x00000000, 0x0000000c, 0x00000003, 0x00000004, + 0x00000001, 0x000000c5, 0x00000001, 0x0000000c, 0x00000003, 0x00000005, 0x00000001, 0x545f5653, + 0x46737365, 0x6f746361, 0x45430072, 0x5245544e, 0x5f565300, 0x69736e49, 0x65546564, 0x61467373, + 0x726f7463, 0xababab00, 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, + 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, + 0x00000001, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, 0x58454853, + 0x00000160, 0x00040050, 0x00000058, 0x01002093, 0x01001895, 0x0100086a, 0x0300005f, 0x0011b0e2, + 0x00000000, 0x0200005f, 0x0001c032, 0x0400005f, 0x002190f2, 0x00000004, 0x00000000, 0x04000067, + 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x02000068, 0x00000002, + 0x0a000000, 0x001000f2, 0x00000000, 0x80219e46, 0x00000041, 0x00000002, 0x00000000, 0x00219e46, + 0x00000003, 0x00000000, 0x09000032, 0x001000f2, 0x00000000, 0x0001c006, 0x00100e46, 0x00000000, + 0x00219e46, 0x00000002, 0x00000000, 0x0a000000, 0x001000f2, 0x00000001, 0x80219e46, 0x00000041, + 0x00000000, 0x00000000, 0x00219e46, 0x00000001, 0x00000000, 0x09000032, 0x001000f2, 0x00000001, + 0x0001c006, 0x00100e46, 0x00000001, 0x00219e46, 0x00000000, 0x00000000, 0x08000000, 0x001000f2, + 0x00000000, 0x00100e46, 0x00000000, 0x80100e46, 0x00000041, 0x00000001, 0x08000032, 0x001020f2, + 0x00000000, 0x0001c556, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, 0x05000036, 0x00102072, + 0x00000001, 0x0011b796, 0x00000000, 0x05000036, 0x00102082, 0x00000001, 0x00004001, 0x3f800000, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)}; + static const DWORD ps_code[] = + { +#if 0 + float4 main(in float4 p : SV_Position, in float4 color : COLOR) : SV_Target + { + return color; + } +#endif + 0x43425844, 0xbd83f517, 0x8974e87a, 0xaf402223, 0xaec7f351, 0x00000001, 0x000000f8, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000003c, 0x00000050, + 0x0000000f, 0x0100086a, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + + memset(&desc, 0, sizeof(desc)); + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, NULL, NULL, NULL); + pso_desc.VS = vs; + pso_desc.HS = hs; + pso_desc.DS = ds; + pso_desc.PS = ps; + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr); + + 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_1_CONTROL_POINT_PATCHLIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 1, 1, 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, 0xff000000, 0); + + destroy_test_context(&context); +} + static void test_render_a8(void) { static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; @@ -25544,6 +25776,7 @@ START_TEST(d3d12) run_test(test_quad_tessellation); run_test(test_tessellation_dcl_index_range); run_test(test_hull_shader_control_point_phase); + run_test(test_hull_shader_fork_phase); run_test(test_render_a8); run_test(test_cpu_descriptors_lifetime); run_test(test_clip_distance); -- 2.19.2

2 1

[PATCH vkd3d 08/10] vkd3d-shader: Use epilogue functions for fork and join phases.
by Józef Kucia March 6, 2019

March 6, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> In order to handle packed outputs properly. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 59 ++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 53aa74a6434d..a734539b7b88 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2024,8 +2024,10 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader const struct vkd3d_shader_compile_arguments *compile_args, const struct vkd3d_shader_scan_info *scan_info) { + const struct vkd3d_shader_signature *patch_constant_signature = &shader_desc->patch_constant_signature; const struct vkd3d_shader_signature *output_signature = &shader_desc->output_signature; struct vkd3d_dxbc_compiler *compiler; + unsigned int max_element_count; unsigned int i; if (!(compiler = vkd3d_malloc(sizeof(*compiler)))) @@ -2033,7 +2035,8 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader memset(compiler, 0, sizeof(*compiler)); - if (!(compiler->output_info = vkd3d_calloc(output_signature->element_count, sizeof(*compiler->output_info)))) + max_element_count = max(output_signature->element_count, patch_constant_signature->element_count); + if (!(compiler->output_info = vkd3d_calloc(max_element_count, sizeof(*compiler->output_info)))) { vkd3d_free(compiler); return NULL; @@ -4005,11 +4008,8 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler vkd3d_dxbc_compiler_decorate_xfb_output(compiler, id, output_component_count, signature_element); } - if (!is_patch_constant) - { - compiler->output_info[signature_idx].id = id; - compiler->output_info[signature_idx].component_type = component_type; - } + compiler->output_info[signature_idx].id = id; + compiler->output_info[signature_idx].component_type = component_type; use_private_variable = component_count != VKD3D_VEC4_SIZE || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE @@ -4047,10 +4047,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); } - if (use_private_variable && is_patch_constant) - FIXME("Private variables not supported for patch constants.\n"); - - if (use_private_variable && !is_patch_constant) + if (use_private_variable) { unsigned int idx = vkd3d_dxbc_compiler_get_output_variable_index(compiler, reg->idx[0].offset); compiler->private_output_variable[idx] = var_id; @@ -4115,6 +4112,9 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi write_mask &= dst_write_mask; use_mask = (output->mask >> 8) & 0xff; + if (!write_mask) + return; + if (output_info->component_type != VKD3D_TYPE_FLOAT) { type_id = vkd3d_spirv_get_type_id(builder, output_info->component_type, VKD3D_VEC4_SIZE); @@ -4177,11 +4177,12 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_compiler *compiler) { uint32_t param_type_id[MAX_REG_OUTPUT + 1], param_id[MAX_REG_OUTPUT + 1] = {}; - const struct vkd3d_shader_signature *signature = compiler->output_signature; uint32_t void_id, type_id, ptr_type_id, function_type_id, function_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_signature *signature; const struct vkd3d_shader_phase *phase; uint32_t output_index_id = 0; + bool is_patch_constant; unsigned int i, count; DWORD variable_idx; @@ -4190,6 +4191,9 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(compiler->private_output_variable_write_mask)); phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler); + is_patch_constant = phase && (phase->type == VKD3DSIH_HS_FORK_PHASE || phase->type == VKD3DSIH_HS_JOIN_PHASE); + + signature = is_patch_constant ? compiler->patch_constant_signature : compiler->output_signature; function_id = compiler->epilogue_function_id; @@ -4251,7 +4255,10 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ vkd3d_spirv_build_op_return(&compiler->spirv_builder); vkd3d_spirv_build_op_function_end(builder); - memset(compiler->output_info, 0, signature->element_count * sizeof(*compiler->output_info)); + /* Fork and join phases share output registers (patch constants). */ + if (!phase || is_control_point_phase(phase)) + memset(compiler->output_info, 0, signature->element_count * sizeof(*compiler->output_info)); + memset(compiler->private_output_variable, 0, sizeof(compiler->private_output_variable)); memset(compiler->private_output_variable_write_mask, 0, sizeof(compiler->private_output_variable_write_mask)); compiler->epilogue_function_id = 0; @@ -5284,6 +5291,29 @@ static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *c } } + if (phase->type == VKD3DSIH_HS_FORK_PHASE || phase->type == VKD3DSIH_HS_JOIN_PHASE) + { + signature = compiler->patch_constant_signature; + + memset(&reg, 0, sizeof(reg)); + reg.idx[1].offset = ~0u; + + for (i = 0; i < signature->element_count; ++i) + { + const struct vkd3d_shader_signature_element *e = &signature->elements[i]; + + reg.type = VKD3DSPR_OUTPUT; + reg.idx[0].offset = e->register_index; + vkd3d_symbol_make_register(&reg_symbol, &reg); + + if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) + { + rb_remove(&compiler->symbol_table, entry); + vkd3d_symbol_free(entry, NULL); + } + } + } + if (phase->instance_count) { reg.type = phase->type == VKD3DSIH_HS_FORK_PHASE ? VKD3DSPR_FORKINSTID : VKD3DSPR_JOININSTID; @@ -6152,11 +6182,8 @@ static void vkd3d_dxbc_compiler_emit_return(struct vkd3d_dxbc_compiler *compiler const struct vkd3d_shader_instruction *instruction) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - const struct vkd3d_shader_phase *phase; - if (compiler->shader_type != VKD3D_SHADER_TYPE_GEOMETRY - && (!(phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler)) - || phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE)) + if (compiler->shader_type != VKD3D_SHADER_TYPE_GEOMETRY) vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(compiler); vkd3d_spirv_build_op_return(builder); -- 2.19.2

2 1

[PATCH vkd3d 07/10] vkd3d-shader: Add basic support for vocp registers.
by Józef Kucia March 6, 2019

March 6, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 28 +++++++++++++++++++----- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index c8e0c379897a..53aa74a6434d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3761,6 +3761,9 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compil case VKD3DSPR_JOININSTID: val_id = phase->instance_id; break; + case VKD3DSPR_OUTCONTROLPOINT: + /* See vkd3d_dxbc_compiler_leave_shader_phase(). */ + return; default: FIXME("Unhandled shader phase input register %#x.\n", reg->type); return; @@ -5227,8 +5230,8 @@ static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *c { const struct vkd3d_shader_signature *signature = compiler->output_signature; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + struct vkd3d_symbol reg_symbol, *symbol; struct vkd3d_shader_register reg; - struct vkd3d_symbol reg_symbol; struct rb_entry *entry; unsigned int i; @@ -5244,26 +5247,39 @@ static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *c compiler->temp_count = 0; /* - * Output regsiters have a different purpose in the control point phase and - * in fork/join phases. We have to remove all output registers' symbols - * when leaving the control point phase. + * vocp inputs in fork and join shader phases are outputs of the control + * point phase. Reinsert symbols for vocp registers while leaving the + * control point phase. */ if (is_control_point_phase(phase)) { memset(&reg, 0, sizeof(reg)); - reg.type = VKD3DSPR_OUTPUT; reg.idx[1].offset = ~0u; for (i = 0; i < signature->element_count; ++i) { const struct vkd3d_shader_signature_element *e = &signature->elements[i]; + reg.type = VKD3DSPR_OUTPUT; reg.idx[0].offset = e->register_index; vkd3d_symbol_make_register(&reg_symbol, &reg); if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) { rb_remove(&compiler->symbol_table, entry); - vkd3d_symbol_free(entry, NULL); + + symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); + + reg.type = VKD3DSPR_OUTCONTROLPOINT; + reg.idx[1].offset = reg.idx[0].offset; + reg.idx[0].offset = compiler->output_control_point_count; + vkd3d_symbol_make_register(symbol, &reg); + symbol->info.reg.is_aggregate = false; + + if (rb_put(&compiler->symbol_table, symbol, entry) == -1) + { + ERR("Failed to insert vocp symbol entry (%s).\n", debug_vkd3d_symbol(symbol)); + vkd3d_symbol_free(entry, NULL); + } } } } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 7ffcdd9c5e77..a6860969c068 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -765,7 +765,7 @@ static inline bool vkd3d_shader_instruction_has_texel_offset(const struct vkd3d_ static inline bool vkd3d_shader_register_is_input(const struct vkd3d_shader_register *reg) { - return reg->type == VKD3DSPR_INPUT || reg->type == VKD3DSPR_INCONTROLPOINT; + return reg->type == VKD3DSPR_INPUT || reg->type == VKD3DSPR_INCONTROLPOINT || reg->type == VKD3DSPR_OUTCONTROLPOINT; } static inline bool vkd3d_shader_register_is_output(const struct vkd3d_shader_register *reg) -- 2.19.2

2 1

[PATCH vkd3d 06/10] vkd3d-shader: Use SPIR-V built-ins for hull shader inputs.
by Józef Kucia March 6, 2019

March 6, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> I missed this case before because apps don't seem to use SV_Position for hull shader inputs. vkd3d_siv_from_sysval() needs to be restored for hull shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bb74400e0d50..c8e0c379897a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -129,6 +129,20 @@ static const void *vkd3d_find_struct_(const struct vkd3d_struct *chain, return NULL; } +static enum vkd3d_shader_input_sysval_semantic vkd3d_siv_from_sysval(enum vkd3d_sysval_semantic sysval) +{ + switch (sysval) + { + case VKD3D_SV_NONE: + return VKD3D_SIV_NONE; + case VKD3D_SV_POSITION: + return VKD3D_SIV_POSITION; + default: + FIXME("Unhandled sysval %#x.\n", sysval); + return VKD3D_SIV_NONE; + } +} + #define VKD3D_SPIRV_VERSION 0x00010000 #define VKD3D_SPIRV_GENERATOR_ID 18 #define VKD3D_SPIRV_GENERATOR_VERSION 1 @@ -3590,6 +3604,9 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi return 0; } + if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL && !sysval && signature_element->sysval_semantic) + sysval = vkd3d_siv_from_sysval(signature_element->sysval_semantic); + builtin = get_spirv_builtin_for_sysval(compiler, sysval); component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); -- 2.19.2

2 1

[PATCH vkd3d 04/10] tests: Get rid of vk_driver_id static variable.
by Józef Kucia March 6, 2019

March 6, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12_crosstest.h | 62 ++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 23 deletions(-) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 082118fa35fe..ae49bf4c68f9 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -358,8 +358,8 @@ static inline bool is_radv_device(ID3D12Device *device) { return false; } + #else -static VkDriverIdKHR vk_driver_id; static bool check_device_extension(VkPhysicalDevice vk_physical_device, const char *name) { @@ -491,26 +491,20 @@ static ID3D12Device *create_device(void) return SUCCEEDED(hr) ? device : NULL; } -static void init_adapter_info(void) +static bool get_driver_properties(ID3D12Device *device, VkPhysicalDeviceDriverPropertiesKHR *driver_properties) { PFN_vkGetPhysicalDeviceProperties2KHR pfn_vkGetPhysicalDeviceProperties2KHR; - VkPhysicalDeviceDriverPropertiesKHR driver_properties; VkPhysicalDeviceProperties2 device_properties2; VkPhysicalDevice vk_physical_device; - struct vkd3d_instance *instance; - ID3D12Device *device; - HRESULT hr; - - if (FAILED(hr = create_vkd3d_instance(&instance))) - return; - if (FAILED(hr = create_vkd3d_device(instance, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device))) - goto done; + memset(driver_properties, 0, sizeof(*driver_properties)); + driver_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR; vk_physical_device = vkd3d_get_vk_physical_device(device); if (check_device_extension(vk_physical_device, VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME)) { + struct vkd3d_instance *instance = vkd3d_instance_from_device(device); VkInstance vk_instance = vkd3d_instance_get_vk_instance(instance); pfn_vkGetPhysicalDeviceProperties2KHR @@ -519,19 +513,32 @@ static void init_adapter_info(void) memset(&device_properties2, 0, sizeof(device_properties2)); device_properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; - device_properties2.pNext = &driver_properties; - memset(&driver_properties, 0, sizeof(driver_properties)); - driver_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR; + device_properties2.pNext = driver_properties; pfn_vkGetPhysicalDeviceProperties2KHR(vk_physical_device, &device_properties2); + return true; + } - trace("Driver name: %s, driver info: %s.\n", driver_properties.driverName, driver_properties.driverInfo); + return false; +} - vk_driver_id = driver_properties.driverID; - } +static void init_adapter_info(void) +{ + VkPhysicalDeviceDriverPropertiesKHR driver_properties; + struct vkd3d_instance *instance; + ID3D12Device *device; + HRESULT hr; + + if (FAILED(hr = create_vkd3d_instance(&instance))) + return; + + if (SUCCEEDED(hr = create_vkd3d_device(instance, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device))) + { + if (get_driver_properties(device, &driver_properties)) + trace("Driver name: %s, driver info: %s.\n", driver_properties.driverName, driver_properties.driverInfo); - ID3D12Device_Release(device); + ID3D12Device_Release(device); + } -done: vkd3d_instance_decref(instance); } @@ -542,18 +549,27 @@ static inline bool is_amd_windows_device(ID3D12Device *device) static inline bool is_mesa_device(ID3D12Device *device) { - return vk_driver_id == VK_DRIVER_ID_MESA_RADV_KHR - || vk_driver_id == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR; + VkPhysicalDeviceDriverPropertiesKHR properties; + + get_driver_properties(device, &properties); + return properties.driverID == VK_DRIVER_ID_MESA_RADV_KHR + || properties.driverID == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR; } static inline bool is_nvidia_device(ID3D12Device *device) { - return vk_driver_id == VK_DRIVER_ID_NVIDIA_PROPRIETARY_KHR; + VkPhysicalDeviceDriverPropertiesKHR properties; + + get_driver_properties(device, &properties); + return properties.driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY_KHR; } static inline bool is_radv_device(ID3D12Device *device) { - return vk_driver_id == VK_DRIVER_ID_MESA_RADV_KHR; + VkPhysicalDeviceDriverPropertiesKHR properties; + + get_driver_properties(device, &properties); + return properties.driverID == VK_DRIVER_ID_MESA_RADV_KHR; } #endif -- 2.19.2

2 1

[PATCH vkd3d 03/10] tests: Implement --adapter option for Vulkan tests.
by Józef Kucia March 6, 2019

March 6, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12_crosstest.h | 208 +++++++++++++++++++++------------------- 1 file changed, 108 insertions(+), 100 deletions(-) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index be6076a45950..082118fa35fe 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -268,6 +268,25 @@ static IUnknown *create_adapter(void) return adapter; } +static ID3D12Device *create_device(void) +{ + IUnknown *adapter = NULL; + ID3D12Device *device; + HRESULT hr; + + if ((use_warp_device || use_adapter_idx) && !(adapter = create_adapter())) + { + trace("Failed to create adapter.\n"); + return NULL; + } + + hr = D3D12CreateDevice(adapter, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device); + if (adapter) + IUnknown_Release(adapter); + + return SUCCEEDED(hr) ? device : NULL; +} + static void init_adapter_info(void) { IDXGIAdapter *dxgi_adapter; @@ -340,9 +359,39 @@ static inline bool is_radv_device(ID3D12Device *device) return false; } #else -static bool have_VK_KHR_driver_properties; static VkDriverIdKHR vk_driver_id; +static bool check_device_extension(VkPhysicalDevice vk_physical_device, const char *name) +{ + VkExtensionProperties *properties; + bool ret = false; + unsigned int i; + uint32_t count; + VkResult vr; + + vr = vkEnumerateDeviceExtensionProperties(vk_physical_device, NULL, &count, NULL); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + if (!count) + return false; + + properties = calloc(count, sizeof(*properties)); + ok(properties, "Failed to allocate memory.\n"); + + vr = vkEnumerateDeviceExtensionProperties(vk_physical_device, NULL, &count, properties); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + for (i = 0; i < count; ++i) + { + if (!strcmp(properties[i].extensionName, name)) + { + ret = true; + break; + } + } + + free(properties); + return ret; +} + static HRESULT create_vkd3d_instance(struct vkd3d_instance **instance) { struct vkd3d_optional_instance_extensions_info optional_extensions_info; @@ -367,21 +416,58 @@ static HRESULT create_vkd3d_instance(struct vkd3d_instance **instance) return vkd3d_create_instance(&instance_create_info, instance); } +static VkPhysicalDevice select_physical_device(struct vkd3d_instance *instance) +{ + VkPhysicalDevice *vk_physical_devices; + VkPhysicalDevice vk_physical_device; + VkInstance vk_instance; + uint32_t count; + VkResult vr; + + vk_instance = vkd3d_instance_get_vk_instance(instance); + + vr = vkEnumeratePhysicalDevices(vk_instance, &count, NULL); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + if (use_adapter_idx >= count) + { + trace("Invalid physical device index %u.\n", use_adapter_idx); + return VK_NULL_HANDLE; + } + + vk_physical_devices = calloc(count, sizeof(*vk_physical_devices)); + ok(vk_physical_devices, "Failed to allocate memory.\n"); + vr = vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + vk_physical_device = vk_physical_devices[use_adapter_idx]; + + free(vk_physical_devices); + + return vk_physical_device; +} + static HRESULT create_vkd3d_device(struct vkd3d_instance *instance, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) { struct vkd3d_device_create_info device_create_info; + VkPhysicalDevice vk_physical_device; static const char * const device_extensions[] = { VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME, }; + if (!(vk_physical_device = select_physical_device(instance))) + return E_INVALIDARG; + memset(&device_create_info, 0, sizeof(device_create_info)); device_create_info.type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO; device_create_info.minimum_feature_level = minimum_feature_level; device_create_info.instance = instance; - if (have_VK_KHR_driver_properties) + device_create_info.vk_physical_device = vk_physical_device; + + if (check_device_extension(vk_physical_device, VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME)) { device_create_info.device_extensions = device_extensions; device_create_info.device_extension_count = ARRAY_SIZE(device_extensions); @@ -390,55 +476,19 @@ static HRESULT create_vkd3d_device(struct vkd3d_instance *instance, return vkd3d_create_device(&device_create_info, iid, device); } -static bool check_device_extension(VkPhysicalDevice vk_physical_device, const char *name) -{ - VkExtensionProperties *properties; - bool ret = false; - unsigned int i; - uint32_t count; - VkResult vr; - - vr = vkEnumerateDeviceExtensionProperties(vk_physical_device, NULL, &count, NULL); - ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); - if (!count) - return false; - - properties = calloc(count, sizeof(*properties)); - ok(properties, "Failed to allocate memory.\n"); - - vr = vkEnumerateDeviceExtensionProperties(vk_physical_device, NULL, &count, properties); - ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); - for (i = 0; i < count; ++i) - { - if (!strcmp(properties[i].extensionName, name)) - { - ret = true; - break; - } - } - - free(properties); - return ret; -} - -HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, - D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) +static ID3D12Device *create_device(void) { struct vkd3d_instance *instance; + ID3D12Device *device; HRESULT hr; if (SUCCEEDED(hr = create_vkd3d_instance(&instance))) { - hr = create_vkd3d_device(instance, minimum_feature_level, iid, device); + hr = create_vkd3d_device(instance, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device); vkd3d_instance_decref(instance); } - return hr; -} - -static IUnknown *create_adapter(void) -{ - return NULL; + return SUCCEEDED(hr) ? device : NULL; } static void init_adapter_info(void) @@ -446,61 +496,38 @@ static void init_adapter_info(void) PFN_vkGetPhysicalDeviceProperties2KHR pfn_vkGetPhysicalDeviceProperties2KHR; VkPhysicalDeviceDriverPropertiesKHR driver_properties; VkPhysicalDeviceProperties2 device_properties2; - VkPhysicalDevice *vk_physical_devices; VkPhysicalDevice vk_physical_device; struct vkd3d_instance *instance; - VkInstance vk_instance; ID3D12Device *device; - uint32_t count, i; - VkResult vr; HRESULT hr; if (FAILED(hr = create_vkd3d_instance(&instance))) return; - vk_instance = vkd3d_instance_get_vk_instance(instance); - - vr = vkEnumeratePhysicalDevices(vk_instance, &count, NULL); - ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); - vk_physical_devices = calloc(count, sizeof(*vk_physical_devices)); - ok(vk_physical_devices, "Failed to allocate memory.\n"); - vr = vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices); - ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); - - have_VK_KHR_driver_properties = true; - for (i = 0; i < count; ++i) - { - if (!check_device_extension(vk_physical_devices[i],VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME)) - { - have_VK_KHR_driver_properties = false; - break; - } - } - - free(vk_physical_devices); - - if (!have_VK_KHR_driver_properties) - goto done; - if (FAILED(hr = create_vkd3d_device(instance, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device))) goto done; vk_physical_device = vkd3d_get_vk_physical_device(device); - pfn_vkGetPhysicalDeviceProperties2KHR - = (void *)vkGetInstanceProcAddr(vk_instance, "vkGetPhysicalDeviceProperties2KHR"); - ok(pfn_vkGetPhysicalDeviceProperties2KHR, "vkGetPhysicalDeviceProperties2KHR is NULL.\n"); + if (check_device_extension(vk_physical_device, VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME)) + { + VkInstance vk_instance = vkd3d_instance_get_vk_instance(instance); + + pfn_vkGetPhysicalDeviceProperties2KHR + = (void *)vkGetInstanceProcAddr(vk_instance, "vkGetPhysicalDeviceProperties2KHR"); + ok(pfn_vkGetPhysicalDeviceProperties2KHR, "vkGetPhysicalDeviceProperties2KHR is NULL.\n"); - memset(&device_properties2, 0, sizeof(device_properties2)); - device_properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; - device_properties2.pNext = &driver_properties; - memset(&driver_properties, 0, sizeof(driver_properties)); - driver_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR; - pfn_vkGetPhysicalDeviceProperties2KHR(vk_physical_device, &device_properties2); + memset(&device_properties2, 0, sizeof(device_properties2)); + device_properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; + device_properties2.pNext = &driver_properties; + memset(&driver_properties, 0, sizeof(driver_properties)); + driver_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR; + pfn_vkGetPhysicalDeviceProperties2KHR(vk_physical_device, &device_properties2); - trace("Driver name: %s, driver info: %s.\n", driver_properties.driverName, driver_properties.driverInfo); + trace("Driver name: %s, driver info: %s.\n", driver_properties.driverName, driver_properties.driverInfo); - vk_driver_id = driver_properties.driverID; + vk_driver_id = driver_properties.driverID; + } ID3D12Device_Release(device); @@ -530,25 +557,6 @@ static inline bool is_radv_device(ID3D12Device *device) } #endif -static ID3D12Device *create_device(void) -{ - IUnknown *adapter = NULL; - ID3D12Device *device; - HRESULT hr; - - if ((use_warp_device || use_adapter_idx) && !(adapter = create_adapter())) - { - trace("Failed to create adapter.\n"); - return NULL; - } - - hr = D3D12CreateDevice(adapter, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device); - if (adapter) - IUnknown_Release(adapter); - - return SUCCEEDED(hr) ? device : NULL; -} - static void parse_args(int argc, char **argv) { unsigned int i; -- 2.19.2

2 1

[PATCH vkd3d 02/10] vkd3d: Add feature level 11_1.
by Józef Kucia March 6, 2019

March 6, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_d3d12.idl | 1 + libs/vkd3d/device.c | 34 ++++++++++++++++++++++++++++------ libs/vkd3d/utils.c | 5 ----- libs/vkd3d/vkd3d_main.c | 6 ------ libs/vkd3d/vkd3d_private.h | 3 ++- 5 files changed, 31 insertions(+), 18 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index a1f87b22e87e..53874141dd12 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -45,6 +45,7 @@ const UINT D3D12_DEFAULT_STENCIL_WRITE_MASK = 0xff; const UINT D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND = 0xffffffff; cpp_quote("#define D3D12_FLOAT32_MAX (3.402823466e+38f)") const UINT D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT = 32; +const UINT D3D12_UAV_SLOT_COUNT = 64; const UINT D3D12_REQ_CONSTANT_BUFFER_ELEMENT_COUNT = 4096; const UINT D3D12_REQ_IMMEDIATE_CONSTANT_BUFFER_ELEMENT_COUNT = 4096; const UINT D3D12_REQ_MIP_LEVELS = 15; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 193a36cb2ee3..fa59593bbdef 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -853,9 +853,11 @@ static void vkd3d_trace_physical_device_features(const VkPhysicalDeviceFeatures2 } } -static void vkd3d_check_feature_level_11_requirements(const struct vkd3d_vulkan_info *vk_info, +static void vkd3d_init_feature_level(struct vkd3d_vulkan_info *vk_info, const VkPhysicalDeviceFeatures *features) { + bool have_11_0 = true; + #define CHECK_MIN_REQUIREMENT(name, value) \ if (vk_info->device_limits.name < value) \ WARN(#name " does not meet feature level 11_0 requirements.\n"); @@ -864,7 +866,10 @@ static void vkd3d_check_feature_level_11_requirements(const struct vkd3d_vulkan_ WARN(#name " does not meet feature level 11_0 requirements.\n"); #define CHECK_FEATURE(name) \ if (!features->name) \ - WARN(#name " is not supported.\n"); + { \ + WARN(#name " is not supported.\n"); \ + have_11_0 = false; \ + } CHECK_MIN_REQUIREMENT(maxPushConstantsSize, D3D12_MAX_ROOT_COST * sizeof(uint32_t)); CHECK_MIN_REQUIREMENT(maxComputeSharedMemorySize, D3D12_CS_TGSM_REGISTER_COUNT * sizeof(uint32_t)); @@ -906,6 +911,17 @@ static void vkd3d_check_feature_level_11_requirements(const struct vkd3d_vulkan_ #undef CHECK_MIN_REQUIREMENT #undef CHECK_MAX_REQUIREMENT #undef CHECK_FEATURE + + vk_info->max_feature_level = D3D_FEATURE_LEVEL_11_0; + + if (have_11_0 + && features->logicOp + && features->vertexPipelineStoresAndAtomics + && vk_info->device_limits.maxPerStageDescriptorStorageBuffers >= D3D12_UAV_SLOT_COUNT + && vk_info->device_limits.maxPerStageDescriptorStorageImages >= D3D12_UAV_SLOT_COUNT) + vk_info->max_feature_level = D3D_FEATURE_LEVEL_11_1; + + TRACE("Max feature level: %#x.\n", vk_info->max_feature_level); } static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, @@ -1030,12 +1046,17 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->vertex_attrib_zero_divisor = false; } - vkd3d_check_feature_level_11_requirements(vulkan_info, features); + vkd3d_free(vk_extensions); + + vkd3d_init_feature_level(vulkan_info, features); + if (vulkan_info->max_feature_level < create_info->minimum_feature_level) + { + WARN("Feature level %#x is not supported.\n", create_info->minimum_feature_level); + return E_INVALIDARG; + } features->shaderTessellationAndGeometryPointSize = VK_FALSE; - vkd3d_free(vk_extensions); - return S_OK; } @@ -1874,6 +1895,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * case D3D12_FEATURE_FEATURE_LEVELS: { + struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; D3D12_FEATURE_DATA_FEATURE_LEVELS *data = feature_data; unsigned int i; @@ -1889,7 +1911,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * for (i = 0; i < data->NumFeatureLevels; ++i) { D3D_FEATURE_LEVEL fl = data->pFeatureLevelsRequested[i]; - if (data->MaxSupportedFeatureLevel < fl && check_feature_level_support(fl)) + if (data->MaxSupportedFeatureLevel < fl && fl <= vulkan_info->max_feature_level) data->MaxSupportedFeatureLevel = fl; } return S_OK; diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 666319e46d90..1c10450d1ea9 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -245,11 +245,6 @@ bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level) return false; } -bool check_feature_level_support(D3D_FEATURE_LEVEL feature_level) -{ - return feature_level <= D3D_FEATURE_LEVEL_11_0; -} - bool is_write_resource_state(D3D12_RESOURCE_STATES state) { return state & (D3D12_RESOURCE_STATE_RENDER_TARGET diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index c65a4abcac55..5e93a2a77407 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -55,12 +55,6 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, return E_INVALIDARG; } - if (!check_feature_level_support(create_info->minimum_feature_level)) - { - FIXME("Unsupported feature level %#x.\n", create_info->minimum_feature_level); - return E_INVALIDARG; - } - if ((instance = create_info->instance)) { vkd3d_instance_incref(instance); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index fa2c4609600c..3292e31bae5a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -100,6 +100,8 @@ struct vkd3d_vulkan_info VkPhysicalDeviceLimits device_limits; VkPhysicalDeviceSparseProperties sparse_properties; + + D3D_FEATURE_LEVEL max_feature_level; }; struct vkd3d_instance @@ -994,7 +996,6 @@ VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *d VkSampleCountFlagBits vk_samples_from_sample_count(unsigned int sample_count) DECLSPEC_HIDDEN; bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN; -bool check_feature_level_support(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN; bool is_valid_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN; bool is_write_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN; -- 2.19.2

2 1