November 2018 - Wine-Commits

Francois Gouget : testbot/web: Add a legend to the statistics page.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: tools Branch: master Commit: 9ba55dc4d78d4dc3718d4df53fb646404b9ddeea URL: https://source.winehq.org/git/tools.git/?a=commit;h=9ba55dc4d78d4dc3718d4df… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 26 01:45:50 2018 +0100 testbot/web: Add a legend to the statistics page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Stats.pl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index ccabb32..2d426ac 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -334,6 +334,22 @@ sub GenerateBody($) _GenStatsLine($VMsStats, "error.count", "Transient errors", $SortedVMKeys); print "</tbody></table></div>\n"; +} + +sub GenerateFooter($) +{ + my ($self) = @_; + print "<p></p><div class='CollectionBlock'><table>\n"; + print "<thead><tr><th class='Record'>Legend</th></tr></thead>\n"; + print "<tbody><tr><td class='Record'>\n"; + + print "<p>The <b>Job rate</b> and <b>Task rate</b> show the average hourly rate at which jobs / tasks are submitted to the TestBot. The <b>Revert rate</b> shows how many reverts have been done per hour to run those tasks. Note that the job and task rates provide a first approximation upper limit on the average time a job or task can take to complete.</p>\n"; + print "<p>The <b>Busy time</b> indicates how long the TestBot had at least one pending task and the <b>Busy %</b> shows how much of the wall clock time this represents. Note that the busy percentage and average <b>Job completion</b> times can be optimized by balancing the load on the different VM hosts.</p>\n"; + print "<p>The average and maximum time statistics show how long the VMs spend in each state of their lifecycle. A VM starts in the powered off or dirty state. It is then <b>reverted</b> to a clean state with the right configuration for the tests. Then it goes into the <b>sleep</b> state during which it gets ready to run the tests. Depending on the VM configuration this may be immediate or may require booting the VM first. Then it goes into the <b>run</b> state while the tests are being uploaded, run, and the results retrieved. This means the test itself takes less time to run than indicated in this statistic. Also note that the <b>WineTest</b> and <b>Wine update</b> tasks are tallied separately because they take much longer than regular tasks. Once the tests complete the VM is marked <b>dirty</b> while it waits for the TestBot to decide whether to power it off, or immediately revert it for the next task.</p>\n"; + print "<p>The errors section shows how many <b>Timeouts</b> occurred, that is how many tasks failed to complete within the alloted time; how many failed due to a <b>TestBot error</b>; and how many had to be rerun due to a <b>Transient error</b> such as a network connection issue.</p>\n"; + + print "</td></tr></tbody>\n"; + print "</tbody></table></div>\n"; print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; print "</div>\n"; }

1 0

Józef Kucia : vkd3d-shader: Translate sample_info instructions.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: vkd3d Branch: master Commit: 2c5a8cda7ac3cf0c9daa2ad222507e8ee3f8612f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2c5a8cda7ac3cf0c9daa2ad… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 26 14:22:26 2018 +0100 vkd3d-shader: Translate sample_info instructions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8c89064..ec7cab6 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1418,6 +1418,13 @@ static uint32_t vkd3d_spirv_build_op_image_query_levels(struct vkd3d_spirv_build SpvOpImageQueryLevels, result_type, image_id); } +static uint32_t vkd3d_spirv_build_op_image_query_samples(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t image_id) +{ + return vkd3d_spirv_build_op_tr1(builder, &builder->function_stream, + SpvOpImageQuerySamples, result_type, image_id); +} + static void vkd3d_spirv_build_op_emit_vertex(struct vkd3d_spirv_builder *builder) { return vkd3d_spirv_build_op(&builder->function_stream, SpvOpEmitVertex); @@ -6414,6 +6421,53 @@ static void vkd3d_dxbc_compiler_emit_resinfo(struct vkd3d_dxbc_compiler *compile vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); } +static void vkd3d_dxbc_compiler_emit_sample_info(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_dst_param *dst = instruction->dst; + const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t constituents[VKD3D_VEC4_SIZE]; + struct vkd3d_shader_image image; + uint32_t type_id, val_id; + unsigned int i; + + if (src->reg.type == VKD3DSPR_RASTERIZER) + { + FIXME("Rasterizer not supported.\n"); + return; + } + + vkd3d_spirv_enable_capability(builder, SpvCapabilityImageQuery); + + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src->reg, NULL, VKD3D_IMAGE_FLAG_NONE); + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); + val_id = vkd3d_spirv_build_op_image_query_samples(builder, type_id, image.image_id); + + constituents[0] = val_id; + for (i = 1; i < VKD3D_VEC4_SIZE; ++i) + constituents[i] = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0); + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, VKD3D_VEC4_SIZE); + val_id = vkd3d_spirv_build_op_composite_construct(builder, type_id, constituents, VKD3D_VEC4_SIZE); + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); + if (instruction->flags == VKD3DSI_SAMPLE_INFO_UINT) + { + val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); + } + else + { + if (instruction->flags) + FIXME("Unhandled flags %#x.\n", instruction->flags); + val_id = vkd3d_spirv_build_op_convert_utof(builder, type_id, val_id); + } + + val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, + val_id, VKD3D_TYPE_FLOAT, src->swizzle, dst->write_mask); + + vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); +} + /* From the Vulkan spec: * * "Scope for execution must be limited to: * Workgroup * Subgroup" @@ -6808,6 +6862,9 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_RESINFO: vkd3d_dxbc_compiler_emit_resinfo(compiler, instruction); break; + case VKD3DSIH_SAMPLE_INFO: + vkd3d_dxbc_compiler_emit_sample_info(compiler, instruction); + break; case VKD3DSIH_SYNC: vkd3d_dxbc_compiler_emit_sync(compiler, instruction); break;

1 0

Józef Kucia : vkd3d: Do not set VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT for multisample textures.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: vkd3d Branch: master Commit: 00afe7545762435a58e28ffcbd063f649390c17c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=00afe7545762435a58e28ff… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 26 14:22:23 2018 +0100 vkd3d: Do not set VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT for multisample textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 56af010..31883f6 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -518,7 +518,8 @@ static HRESULT vkd3d_create_image(struct d3d12_device *device, if (!(desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL) && dxgi_format_is_typeless(desc->Format)) image_info.flags |= VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D - && desc->Width == desc->Height && desc->DepthOrArraySize >= 6) + && desc->Width == desc->Height && desc->DepthOrArraySize >= 6 + && desc->SampleDesc.Count == 1) image_info.flags |= VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT; if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) image_info.flags |= VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR;

1 0

Józef Kucia : vkd3d: Add support for multisample texture views.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: vkd3d Branch: master Commit: 46c6bc6171c5cd6ff2435e94dd2fcbd0d8d4c3da URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=46c6bc6171c5cd6ff2435e9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 26 14:22:25 2018 +0100 vkd3d: Add support for multisample texture views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 31883f6..36c5cb2 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1785,6 +1785,14 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, if (desc->u.Texture2DArray.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2DArray.ResourceMinLODClamp); break; + case D3D12_SRV_DIMENSION_TEXTURE2DMS: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; + break; + case D3D12_SRV_DIMENSION_TEXTURE2DMSARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DMSArray.ArraySize; + break; case D3D12_SRV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; vkd3d_desc.miplevel_idx = desc->u.Texture3D.MostDetailedMip; @@ -2176,6 +2184,14 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev if (desc->u.Texture2DArray.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); break; + case D3D12_RTV_DIMENSION_TEXTURE2DMS: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; + break; + case D3D12_RTV_DIMENSION_TEXTURE2DMSARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DMSArray.ArraySize; + break; case D3D12_RTV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; @@ -2261,6 +2277,14 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; break; + case D3D12_DSV_DIMENSION_TEXTURE2DMS: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; + break; + case D3D12_DSV_DIMENSION_TEXTURE2DMSARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DMSArray.ArraySize; + break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); }

1 0

Józef Kucia : tests: Add test for multisample array textures.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: vkd3d Branch: master Commit: ed4f8749f25b289e392d00897afe43d8398ac861 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ed4f8749f25b289e392d008… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 26 14:22:27 2018 +0100 tests: Add test for multisample array textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 223 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 223 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=ed4f8749f25b289e392…

1 0

Józef Kucia : vkd3d-shader: Add support for 2D MS arrays.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: vkd3d Branch: master Commit: 23361bbcb2466f5e4259068310d9898e53af177f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=23361bbcb2466f5e4259068… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 26 14:22:24 2018 +0100 vkd3d-shader: Add support for 2D MS arrays. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 12fa300..8c89064 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1643,6 +1643,7 @@ vkd3d_spirv_resource_type_table[] = {VKD3D_SHADER_RESOURCE_TEXTURE_1DARRAY, SpvDim1D, 1, 0, 2, 1, SpvCapabilitySampled1D, SpvCapabilityImage1D}, {VKD3D_SHADER_RESOURCE_TEXTURE_2DARRAY, SpvDim2D, 1, 0, 3, 2}, + {VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY, SpvDim2D, 1, 1, 3, 2}, {VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY, SpvDimCube, 1, 0, 3, 0, SpvCapabilitySampledCubeArray, SpvCapabilityImageCubeArray}, };

1 0

Alexandre Julliard : Wine release 3.21
by Alexandre Julliard Nov. 23, 2018

Nov. 23, 2018

Module: website Branch: master Commit: 0f1a2c14ed69f9493900c418f74456782210caa2 URL: https://source.winehq.org/git/website.git/?a=commit;h=0f1a2c14ed69f9493900c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 23 21:18:22 2018 +0100 Wine release 3.21 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018112301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2018112301.xml b/news/en/2018112301.xml new file mode 100644 index 0000000..847aa3b --- /dev/null +++ b/news/en/2018112301.xml @@ -0,0 +1,16 @@ +<news> +<date>November 23, 2018</date> +<title>Wine 3.21 Released</title> +<body> +<p> The Wine development release 3.21 is now available.</p> +<p> <a href="{$root}/announce/3.21">What's new</a> in this release: +<ul> + <li>Typelib marshaller rewrite using NDR functions.</li> + <li>Graphics support on recent Android versions.</li> + <li>Support for memory font resources in DirectWrite.</li> + <li>Joystick support improvements.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.21.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Alexandre Julliard : Release 3.21.
by Alexandre Julliard Nov. 23, 2018

Nov. 23, 2018

Module: wine Branch: master Commit: ea9253d6d3c9bb60d98b0d917292fc0b4babb3dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea9253d6d3c9bb60d98b0d91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 23 21:16:24 2018 +0100 Release 3.21. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 804 +++++++++++++++++++++++++++++++++++--------------------------- AUTHORS | 6 + VERSION | 2 +- configure | 18 +- 4 files changed, 471 insertions(+), 359 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ea9253d6d3c9bb60d98b…

1 0

Tag wine-3.21 : Alexandre Julliard : Release 3.21
by Alexandre Julliard Nov. 23, 2018

Nov. 23, 2018

Module: wine Branch: refs/tags/wine-3.21 Tag: c6740654fd7afc2fb291b0ae63097caa27107f79 URL: https://source.winehq.org/git/wine.git/?a=tag;h=c6740654fd7afc2fb291b0ae630… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 23 21:16:24 2018 +0100 Release 3.21

1 0

Sven Baars : mfplat: Improve CreateObjectFromByteStream stub in IMFSourceResolver.
by Alexandre Julliard Nov. 23, 2018

Nov. 23, 2018

Module: wine Branch: master Commit: 11011a6a38acf6df921237ecc1ff31a5b96e9a4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=11011a6a38acf6df921237ec… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Nov 22 21:00:45 2018 +0100 mfplat: Improve CreateObjectFromByteStream stub in IMFSourceResolver. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 187 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/tests/mfplat.c | 78 ++++++++++++++++++- include/mfidl.idl | 36 +++++++++ 3 files changed, 299 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=11011a6a38acf6df9212…

1 0