November 2019 - Wine-Commits

Philip Rebohle : vkd3d: Handle DXGI_FORMAT_R11G11B10_FLOAT in d3d12_command_list_ClearUnorderedAccessViewUint().
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: vkd3d Branch: master Commit: a204a681a1878bee29cc7094b9265ac45d3ad949 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a204a681a1878bee29cc709… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Mon Nov 25 17:53:40 2019 +0330 vkd3d: Handle DXGI_FORMAT_R11G11B10_FLOAT in d3d12_command_list_ClearUnorderedAccessViewUint(). There is no bit-compatible UINT format, so we'll use DXGI_FORMAT_R32_UINT. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 19 ++++++++++++++++++- tests/d3d12.c | 8 ++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index e3810e2..75af27d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4979,6 +4979,22 @@ static void d3d12_command_list_clear_uav(struct d3d12_command_list *list, } } +static const struct vkd3d_format *vkd3d_fixup_clear_uav_uint_colour(struct d3d12_device *device, + DXGI_FORMAT dxgi_format, VkClearColorValue *colour) +{ + switch (dxgi_format) + { + case DXGI_FORMAT_R11G11B10_FLOAT: + colour->uint32[0] = (colour->uint32[0] & 0x7ff) + | ((colour->uint32[1] & 0x7ff) << 11) + | ((colour->uint32[2] & 0x3ff) << 22); + return vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); + + default: + return NULL; + } +} + static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID3D12GraphicsCommandList1 *iface, D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle, D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle, ID3D12Resource *resource, const UINT values[4], UINT rect_count, const D3D12_RECT *rects) @@ -5000,7 +5016,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID if (view->format->type != VKD3D_FORMAT_TYPE_UINT) { - if (!(uint_format = vkd3d_find_uint_format(device, view->format->dxgi_format))) + if (!(uint_format = vkd3d_find_uint_format(device, view->format->dxgi_format)) + && !(uint_format = vkd3d_fixup_clear_uav_uint_colour(device, view->format->dxgi_format, &colour))) { ERR("Unhandled format %#x.\n", view->format->dxgi_format); return; diff --git a/tests/d3d12.c b/tests/d3d12.c index 5d549e2..52de007 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4839,11 +4839,11 @@ static void test_clear_unordered_access_view_buffer(void) {0x100, 0, 0, 0}, 0, false, true}, {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {0, 0, 0, 0}, 0, false, true}, + {0, 0, 0, 0}, 0}, {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {0x7ff, 0x7ff, 0x3ff, 0}, 0xffffffff, false, true}, + {0x7ff, 0x7ff, 0x3ff, 0}, 0xffffffff}, {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, - {0x7ff, 0, 0x3ff, 0}, 0xffc007ff, false, true}, + {0x7ff, 0, 0x3ff, 0}, 0xffc007ff}, {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0x40000000 /* 2.0f */, 0}, 0x801e0380, true}, {DXGI_FORMAT_R11G11B10_FLOAT, { 0, BUFFER_SIZE / sizeof(uint32_t), 0, 0, D3D12_BUFFER_UAV_FLAG_NONE}, @@ -5011,7 +5011,7 @@ static void test_clear_unordered_access_view_image(void) {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x04030201}, {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, 0, {}, {0x123, 0, 0, 0}, 0x00000023, false, true}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x04030201}, - {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00c01001, false, true}, + {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00c01001}, /* Test float clears with formats. */ {DXGI_FORMAT_R16G16_UNORM, 1, 1, 0, 0, 1, 0, {}, {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff8000, true},

1 0

Conor McCarthy : vkd3d: Add tests for external resource heap properties.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: vkd3d Branch: master Commit: 5366d405e9c3da30baef92f235721c872c856aa1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5366d405e9c3da30baef92f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Nov 25 17:53:41 2019 +0330 vkd3d: Add tests for external resource heap properties. 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> --- tests/vkd3d_api.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index a9a7fc1..135782d 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -854,7 +854,9 @@ static VkDeviceMemory allocate_vulkan_image_memory(ID3D12Device *device, static void test_external_resource_map(void) { struct vkd3d_image_resource_create_info resource_create_info; + D3D12_HEAP_PROPERTIES heap_properties; D3D12_GPU_VIRTUAL_ADDRESS gpu_address; + D3D12_HEAP_FLAGS heap_flags; ID3D12Resource *vk_resource; VkDeviceMemory vk_memory; ID3D12Device *device; @@ -898,6 +900,16 @@ static void test_external_resource_map(void) gpu_address = ID3D12Resource_GetGPUVirtualAddress(vk_resource); ok(!gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address); + hr = ID3D12Resource_GetHeapProperties(vk_resource, &heap_properties, &heap_flags); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(heap_properties.Type == D3D12_HEAP_TYPE_DEFAULT, "Got unexpected heap type %#x.\n", heap_properties.Type); + ok(heap_properties.CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_UNKNOWN, + "Got unexpected CPU page property %#x.\n", heap_properties.CPUPageProperty); + ok(heap_properties.MemoryPoolPreference == D3D12_MEMORY_POOL_UNKNOWN, + "Got unexpected memory pool preference %#x.\n", heap_properties.MemoryPoolPreference); + todo ok(!!heap_properties.CreationNodeMask, "Got unexpected node mask %#x.\n", heap_properties.CreationNodeMask); + todo ok(!!heap_properties.VisibleNodeMask, "Got unexpected node mask %#x.\n", heap_properties.VisibleNodeMask); + ID3D12Resource_Release(vk_resource); vk_device = vkd3d_get_vk_device(device); vkDestroyImage(vk_device, vk_image, NULL);

1 0

Philip Rebohle : vkd3d: Set VK_IMAGE_MUTABLE_FORMAT_BIT for UAV images with non-UINT formats.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: vkd3d Branch: master Commit: 65ee0562f942ab16c81da9b6e5dceedbac0a132e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=65ee0562f942ab16c81da9b… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Mon Nov 25 17:53:38 2019 +0330 vkd3d: Set VK_IMAGE_MUTABLE_FORMAT_BIT for UAV images with non-UINT formats. Needed to support ClearUnorderedAccessViewUint() for all formats. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 8615464..7d22ba4 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -864,13 +864,17 @@ static HRESULT vkd3d_create_image(struct d3d12_device *device, image_info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; image_info.pNext = NULL; image_info.flags = 0; - if (!(desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL) && format->type == VKD3D_FORMAT_TYPE_TYPELESS) + if (desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS) + { + /* Format compatibility rules are more relaxed for UAVs. */ + if (format->type != VKD3D_FORMAT_TYPE_UINT) + image_info.flags |= VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; + } + else if (!(desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL) && format->type == VKD3D_FORMAT_TYPE_TYPELESS) { image_info.flags |= VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; - /* Format compatibility rules are more relaxed for UAVs. */ - if (!(desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS) - && (compat_list = vkd3d_get_format_compatibility_list(device, desc->Format))) + if ((compat_list = vkd3d_get_format_compatibility_list(device, desc->Format))) { format_list.sType = VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO_KHR; format_list.pNext = NULL;

1 0

Francois Gouget : testbot: Give a higher priority to wine VMs.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: tools Branch: master Commit: 7d05cb40e47f0e98d5897cfc38b37039c6916e18 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7d05cb40e47f0e98d5897cf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 22 15:54:18 2019 +0100 testbot: Give a higher priority to wine VMs. They are needed for patches that don't impact the Windows tests and thus are more likely to be needed next than Windows VMs. The build VMs should still remain in the top spot because delaying their tasks delays all the corresponding Windows tasks, which would leave the TestBot partially idle. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index b6a8998..c28e143 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -411,9 +411,9 @@ sub _CheckAndClassifyVMs() $VM->Role eq "winetest" ? 10 : 20) + # extra ($VM->Type eq "build" ? 0 : - $VM->Type eq "win64" ? 1 : - $VM->Type eq "win32" ? 2 : - 3); # wine + $VM->Type eq "wine" ? 1 : + $VM->Type eq "win64" ? 2 : + 3); # win32 } # If a VM was in an inconsistent state, update the jobs status fields before

1 0

Alexandre Julliard : Wine release 4.0.3
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: website Branch: master Commit: e46fd827eeaa22867f68dffc92f34ed5f0602781 URL: https://source.winehq.org/git/website.git/?a=commit;h=e46fd827eeaa22867f68d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 16:12:37 2019 +0100 Wine release 4.0.3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019112501.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2019112501.xml b/news/en/2019112501.xml new file mode 100644 index 00000000..82c394b4 --- /dev/null +++ b/news/en/2019112501.xml @@ -0,0 +1,13 @@ +<news> +<date>November 25, 2019</date> +<title>Wine 4.0.3 Released</title> +<body> + The Wine maintenance release 4.0.3 is now available. + <a href="{$root}/announce/4.0.3">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> + <li>Updates to the National Language Support files</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.0/wine-4.0.3.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>. +</body></news>

1 0

Michael Stefaniuc : Release 4.0.3.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: ab71182fbe93e9f01db7ffbc8f3e2f86cadd4344 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab71182fbe93e9f01db7ffbc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Nov 16 22:18:20 2019 +0100 Release 4.0.3. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 491 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 7 + VERSION | 2 +- configure | 18 +-- 4 files changed, 290 insertions(+), 228 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab71182fbe93e9f01db7…

1 0

Tag wine-4.0.3 : Alexandre Julliard : Release 4.0.3
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: refs/tags/wine-4.0.3 Tag: 42379f92778237b32f63f4cb3355d8d10eb85d78 URL: https://source.winehq.org/git/wine.git/?a=tag;h=42379f92778237b32f63f4cb335… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 16:10:40 2019 +0100 Release 4.0.3

1 0

Andrey Gusev : d3dx11: Fix D3DX11CreateShaderResourceViewFromMemory spec entry.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: f990ce86524629dbcb8ad0f74038f1c8c07b10b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f990ce86524629dbcb8ad0f7… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jan 30 22:41:49 2019 +0200 d3dx11: Fix D3DX11CreateShaderResourceViewFromMemory spec entry. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42078 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8bf63a4c37e534d02b0eeebf91135d99b8ee4a88) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx11_43/d3dx11_43.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 76a3916e71..dde8821a30 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -17,7 +17,7 @@ @ stub D3DX11CreateAsyncTextureProcessor @ stub D3DX11CreateShaderResourceViewFromFileA @ stub D3DX11CreateShaderResourceViewFromFileW -@ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) +@ stdcall D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW @ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr)

1 0

Nikolay Sivov : kernel32/nls: Add LOCALE_SPERMILLE data.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

1 0

Nikolay Sivov : kernel32/nls: Add LOCALE_SPERCENT locale data.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

1 0