September 2021 - Wine-commits

Zhiyi Zhang : winemine: Add system DPI awareness settings to the application manifest.
by Alexandre Julliard 08 Sep '21

08 Sep '21

Module: wine Branch: master Commit: 1fcc3bce8c25b41335df72bc565a6cee53351597 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fcc3bce8c25b41335df72bc… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 8 10:25:23 2021 +0800 winemine: Add system DPI awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemine/winemine.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/winemine/winemine.manifest b/programs/winemine/winemine.manifest index 8850b090e37..d0fe0a892c4 100644 --- a/programs/winemine/winemine.manifest +++ b/programs/winemine/winemine.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0

Zhiyi Zhang : winetest: Add system DPI awareness settings to the application manifest.
by Alexandre Julliard 08 Sep '21

08 Sep '21

Module: wine Branch: master Commit: 54ac92790a822420aaedc5ac70a3a151a84ca0a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54ac92790a822420aaedc5ac… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 8 10:25:31 2021 +0800 winetest: Add system DPI awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/winetest.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/winetest/winetest.manifest b/programs/winetest/winetest.manifest index a3b110b5eda..ca6433583b7 100644 --- a/programs/winetest/winetest.manifest +++ b/programs/winetest/winetest.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0

Zhiyi Zhang : winevdm: Add system DPI awareness settings to the application manifest.
by Alexandre Julliard 08 Sep '21

08 Sep '21

Module: wine Branch: master Commit: 227446dacdbbefa20950c34c25819936e8aaab82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=227446dacdbbefa20950c34c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 8 10:25:57 2021 +0800 winevdm: Add system DPI awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winevdm/winevdm.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/winevdm/winevdm.manifest b/programs/winevdm/winevdm.manifest index 9634ec55524..6547ce24206 100644 --- a/programs/winevdm/winevdm.manifest +++ b/programs/winevdm/winevdm.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0

Zhiyi Zhang : winver: Add system DPI awareness settings to the application manifest.
by Alexandre Julliard 08 Sep '21

08 Sep '21

Module: wine Branch: master Commit: bfd1e33fb3237b08f2833fcbc119e517ecf8be11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfd1e33fb3237b08f2833fcb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 8 10:26:05 2021 +0800 winver: Add system DPI awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winver/winver.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/winver/winver.manifest b/programs/winver/winver.manifest index 519bd175c19..f527afb8265 100644 --- a/programs/winver/winver.manifest +++ b/programs/winver/winver.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0

Zhiyi Zhang : wordpad: Add system DPI awareness settings to the application manifest.
by Alexandre Julliard 08 Sep '21

08 Sep '21

Module: wine Branch: master Commit: b8578a8ba93158e29305496618c1978924fecbc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8578a8ba93158e293054966… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 8 10:26:59 2021 +0800 wordpad: Add system DPI awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/wordpad/wordpad.manifest b/programs/wordpad/wordpad.manifest index 51fb21fa97d..26cdfed0569 100644 --- a/programs/wordpad/wordpad.manifest +++ b/programs/wordpad/wordpad.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.2.191.
by Alexandre Julliard 08 Sep '21

08 Sep '21

Module: wine Branch: master Commit: fb65de04d5c0b878d74ad33be559144933a0d01f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb65de04d5c0b878d74ad33b… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Sep 7 21:39:18 2021 +0200 winevulkan: Update to VK spec version 1.2.191. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader_thunks.c | 6 + dlls/winevulkan/loader_thunks.h | 1 + dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 24 ++ dlls/winevulkan/vulkan_thunks.h | 2 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 772 ++++++++++++++++++++-------------------- 7 files changed, 427 insertions(+), 382 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fb65de04d5c0b878d74a…

1 0

Zebediah Figura : d3dcompiler/tests: Link directly to the relevant d3dcompiler version.
by Alexandre Julliard 08 Sep '21

08 Sep '21

Module: wine Branch: master Commit: 910a398b729c61db8e803709368d011fd9b8ce33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=910a398b729c61db8e803709… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 1 12:12:49 2021 -0500 d3dcompiler/tests: Link directly to the relevant d3dcompiler version. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/Makefile.in | 1 + dlls/d3dcompiler_43/tests/Makefile.in | 2 +- dlls/d3dcompiler_43/tests/asm.c | 80 +++++++++------------------------- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 32 ++------------ dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 78 ++++++++++----------------------- dlls/d3dcompiler_43/tests/reflection.c | 52 +++++----------------- dlls/d3dcompiler_47/tests/Makefile.in | 2 +- 7 files changed, 62 insertions(+), 185 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=910a398b729c61db8e80…

1 0

Conor McCarthy : vkd3d: Change to void the return type for ID3D12GraphicsCommandList::ClearState().
by Alexandre Julliard 08 Sep '21

08 Sep '21

Module: vkd3d Branch: master Commit: 2ed344a5f08c416bebd1f6011fe501c833b21e44 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2ed344a5f08c416bebd1f60… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Sep 4 00:58:55 2021 +1000 vkd3d: Change to void the return type for ID3D12GraphicsCommandList::ClearState(). ClearState() does not return a value. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 2 +- libs/vkd3d/command.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 11e597d..2d9aa1b 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2052,7 +2052,7 @@ interface ID3D12GraphicsCommandList : ID3D12CommandList HRESULT Reset(ID3D12CommandAllocator *allocator, ID3D12PipelineState *initial_state); - HRESULT ClearState(ID3D12PipelineState *pipeline_state); + void ClearState(ID3D12PipelineState *pipeline_state); void DrawInstanced(UINT vertex_count_per_instance, UINT instance_count, UINT start_vertex_location, UINT start_instance_location); diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 964f5cd..46c0c3a 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2398,12 +2398,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Reset(ID3D12GraphicsCommandL return hr; } -static HRESULT STDMETHODCALLTYPE d3d12_command_list_ClearState(ID3D12GraphicsCommandList2 *iface, +static void STDMETHODCALLTYPE d3d12_command_list_ClearState(ID3D12GraphicsCommandList2 *iface, ID3D12PipelineState *pipeline_state) { FIXME("iface %p, pipline_state %p stub!\n", iface, pipeline_state); - - return E_NOTIMPL; } static bool d3d12_command_list_has_depth_stencil_view(struct d3d12_command_list *list)

1 0

Conor McCarthy : vkd3d: Handle D3D_PRIMITIVE_TOPOLOGY_UNDEFINED.
by Alexandre Julliard 08 Sep '21

08 Sep '21

Module: vkd3d Branch: master Commit: 471b8e2206a9ee8fc57af36e181f96049282ddb8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=471b8e2206a9ee8fc57af36… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Sep 4 00:58:56 2021 +1000 vkd3d: Handle D3D_PRIMITIVE_TOPOLOGY_UNDEFINED. Bundles need to set an undefined topology to match D3D12 behaviour. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 6 ------ libs/vkd3d/state.c | 8 ++++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 46c0c3a..9f4a414 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3660,12 +3660,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetPrimitiveTopology(ID3D12Gr TRACE("iface %p, topology %#x.\n", iface, topology); - if (topology == D3D_PRIMITIVE_TOPOLOGY_UNDEFINED) - { - WARN("Ignoring D3D_PRIMITIVE_TOPOLOGY_UNDEFINED.\n"); - return; - } - if (list->primitive_topology == topology) return; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 58463e5..4eccf1e 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2754,6 +2754,8 @@ static enum VkPrimitiveTopology vk_topology_from_d3d12_topology(D3D12_PRIMITIVE_ case D3D_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST: case D3D_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST: return VK_PRIMITIVE_TOPOLOGY_PATCH_LIST; + case D3D_PRIMITIVE_TOPOLOGY_UNDEFINED: + return VK_PRIMITIVE_TOPOLOGY_MAX_ENUM; default: FIXME("Unhandled primitive topology %#x.\n", topology); return VK_PRIMITIVE_TOPOLOGY_POINT_LIST; @@ -2938,6 +2940,12 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta ia_desc.topology = vk_topology_from_d3d12_topology(topology); ia_desc.primitiveRestartEnable = !!graphics->index_buffer_strip_cut_value; + if (ia_desc.topology == VK_PRIMITIVE_TOPOLOGY_MAX_ENUM) + { + WARN("Primitive topology is undefined.\n"); + return VK_NULL_HANDLE; + } + tessellation_info.sType = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO; tessellation_info.pNext = NULL; tessellation_info.flags = 0;

1 0

Giovanni Mascellani : tests: Test casting to and then from bool.
by Alexandre Julliard 08 Sep '21

08 Sep '21

Module: vkd3d Branch: master Commit: 8555896bb0101482a3a84bdd44325e4cf564b19e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8555896bb0101482a3a84bd… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Sep 8 17:38:10 2021 +0200 tests: Test casting to and then from bool. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ tests/hlsl-bool-cast.shader_test | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/Makefile.am b/Makefile.am index 3c18c31..05d9f00 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,6 +56,7 @@ vkd3d_shader_runners = \ vkd3d_shader_tests = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-bool-cast.shader_test \ tests/hlsl-clamp.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ @@ -267,6 +268,7 @@ SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-bool-cast.shader_test \ tests/hlsl-clamp.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ diff --git a/tests/hlsl-bool-cast.shader_test b/tests/hlsl-bool-cast.shader_test new file mode 100644 index 0000000..8880b2f --- /dev/null +++ b/tests/hlsl-bool-cast.shader_test @@ -0,0 +1,14 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + return float4( + (float)(bool)0.0, + (float)(bool)0, + (float)(bool)2.0, + (float)(bool)2 + ); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 1.0, 1.0)

1 0