January 2019 - Wine-Commits

Alexandre Julliard : Release 4.0.
by Alexandre Julliard Jan. 22, 2019

Jan. 22, 2019

Module: wine Branch: master Commit: 6b42eae19f3bd9a4f4412fcb21c2f46a4c95bbfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b42eae19f3bd9a4f4412fcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 22 22:25:59 2019 +0100 Release 4.0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 559 +++++++++++++++++++++++++++++++++++++++++++++++++++----------- VERSION | 2 +- configure | 18 +- 3 files changed, 475 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6b42eae19f3bd9a4f441…

1 0

Józef Kucia : vkd3d: Allow D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT only for small textures.
by Alexandre Julliard Jan. 22, 2019

Jan. 22, 2019

Module: vkd3d Branch: master Commit: 39eb9fe5d86f82311b922204947879539dd62ad5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=39eb9fe5d86f82311b92220… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 18 10:25:48 2019 +0100 vkd3d: Allow D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT only for small textures. Use a simple heuristic to decide if a resource is "small". The heuristic is based on theoretical constraints for the most detailed mip level of small resources. Those constraints are mentioned in D3D12 validation layer errors and in the DirectX 12 Graphics samples. 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/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 7c20062..7a6dcb6 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2076,6 +2076,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour { UINT64 default_alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; struct d3d12_device *device = impl_from_ID3D12Device(iface); + const struct vkd3d_format *format; const D3D12_RESOURCE_DESC *desc; bool valid = true; @@ -2118,7 +2119,26 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour valid = false; } - info->Alignment = max(info->Alignment, D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT); + if (valid && info->Alignment < D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + { + if ((format = vkd3d_format_from_d3d12_resource_desc(desc, 0))) + { + if (desc->Width * desc->Height * desc->DepthOrArraySize * format->byte_count + > D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + { + info->Alignment = max(info->Alignment, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT); + } + else + { + info->Alignment = max(info->Alignment, D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT); + } + } + else + { + WARN("Invalid format %#x.\n", desc->Format); + valid = false; + } + } } if (valid && desc->Alignment % info->Alignment)

1 0

Józef Kucia : tests: Test GetCopyableFootprints() with base offset.
by Alexandre Julliard Jan. 22, 2019

Jan. 22, 2019

Module: vkd3d Branch: master Commit: 1561c8a9c2d8eb54b95ddbfa7edea3db1477b9e3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1561c8a9c2d8eb54b95ddbf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 18 10:25:47 2019 +0100 tests: Test GetCopyableFootprints() with base offset. 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 | 94 ++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 54 insertions(+), 40 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 41704b3..bccface 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -14619,10 +14619,10 @@ static void test_null_descriptors(void) destroy_test_context(&context); } -#define check_copyable_footprints(a, b, c, d, e, f, g) \ - check_copyable_footprints_(__LINE__, a, b, c, d, e, f, g) +#define check_copyable_footprints(a, b, c, d, e, f, g, h) \ + check_copyable_footprints_(__LINE__, a, b, c, d, e, f, g, h) static void check_copyable_footprints_(unsigned int line, const D3D12_RESOURCE_DESC *desc, - unsigned int sub_resource_idx, unsigned int sub_resource_count, + unsigned int sub_resource_idx, unsigned int sub_resource_count, UINT64 base_offset, const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *layouts, const UINT *row_counts, const UINT64 *row_sizes, UINT64 *total_size) { @@ -14647,7 +14647,8 @@ static void check_copyable_footprints_(unsigned int line, const D3D12_RESOURCE_D const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *l = &layouts[i]; const D3D12_SUBRESOURCE_FOOTPRINT *f = &l->Footprint; - ok_(line)(l->Offset == offset, "Got offset %"PRIu64", expected %"PRIu64".\n", l->Offset, offset); + ok_(line)(l->Offset == base_offset + offset, + "Got offset %"PRIu64", expected %"PRIu64".\n", l->Offset, base_offset + offset); ok_(line)(f->Format == desc->Format, "Got format %#x, expected %#x.\n", f->Format, desc->Format); ok_(line)(f->Width == width, "Got width %u, expected %u.\n", f->Width, width); ok_(line)(f->Height == height, "Got height %u, expected %u.\n", f->Height, height); @@ -14678,7 +14679,7 @@ static void test_get_copyable_footprints(void) D3D12_RESOURCE_DESC resource_desc; UINT64 row_sizes[10], total_size; unsigned int sub_resource_count; - unsigned int i, j, k; + unsigned int i, j, k, l; ID3D12Device *device; UINT row_counts[10]; ULONG refcount; @@ -14732,6 +14733,10 @@ static void test_get_copyable_footprints(void) {DXGI_FORMAT_BC6H_SF16, true}, {DXGI_FORMAT_BC7_UNORM, true}, }; + static const UINT64 base_offsets[] = + { + 0, 1, 2, 30, 255, 512, 513, 600, 4096, 4194304, ~(UINT64)0, + }; static const struct { D3D12_RESOURCE_DESC resource_desc; @@ -14780,7 +14785,6 @@ static void test_get_copyable_footprints(void) return; } - /* TODO: test base offset */ for (i = 0; i < ARRAY_SIZE(resources); ++i) { const bool is_buffer = resources[i].dimension == D3D12_RESOURCE_DIMENSION_BUFFER; @@ -14814,49 +14818,59 @@ static void test_get_copyable_footprints(void) sub_resource_count *= resource_desc.DepthOrArraySize; assert(sub_resource_count <= ARRAY_SIZE(layouts)); - memset(layouts, 0, sizeof(layouts)); - memset(row_counts, 0, sizeof(row_counts)); - memset(row_sizes, 0, sizeof(row_sizes)); - total_size = 0; - ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, 0, - layouts, row_counts, row_sizes, &total_size); - check_copyable_footprints(&resource_desc, 0, sub_resource_count, - layouts, row_counts, row_sizes, &total_size); - - memset(layouts, 0, sizeof(layouts)); - ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, 0, - layouts, NULL, NULL, NULL); - check_copyable_footprints(&resource_desc, 0, sub_resource_count, - layouts, NULL, NULL, NULL); - memset(row_counts, 0, sizeof(row_counts)); - ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, 0, - NULL, row_counts, NULL, NULL); - check_copyable_footprints(&resource_desc, 0, sub_resource_count, - NULL, row_counts, NULL, NULL); - memset(row_sizes, 0, sizeof(row_sizes)); - ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, 0, - NULL, NULL, row_sizes, NULL); - check_copyable_footprints(&resource_desc, 0, sub_resource_count, - NULL, NULL, row_sizes, NULL); - total_size = 0; - ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, 0, - NULL, NULL, NULL, &total_size); - check_copyable_footprints(&resource_desc, 0, sub_resource_count, - NULL, NULL, NULL, &total_size); - - for (k = 0; k < sub_resource_count; ++k) + for (k = 0; k < ARRAY_SIZE(base_offsets); ++k) { + vkd3d_test_set_context("resource %u, format %#x, offset %#"PRIx64, + i, resource_desc.Format, base_offsets[k]); + memset(layouts, 0, sizeof(layouts)); memset(row_counts, 0, sizeof(row_counts)); memset(row_sizes, 0, sizeof(row_sizes)); total_size = 0; - ID3D12Device_GetCopyableFootprints(device, &resource_desc, k, 1, 0, + ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, base_offsets[k], layouts, row_counts, row_sizes, &total_size); - check_copyable_footprints(&resource_desc, k, 1, + check_copyable_footprints(&resource_desc, 0, sub_resource_count, base_offsets[k], layouts, row_counts, row_sizes, &total_size); + + memset(layouts, 0, sizeof(layouts)); + ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, base_offsets[k], + layouts, NULL, NULL, NULL); + check_copyable_footprints(&resource_desc, 0, sub_resource_count, base_offsets[k], + layouts, NULL, NULL, NULL); + memset(row_counts, 0, sizeof(row_counts)); + ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, base_offsets[k], + NULL, row_counts, NULL, NULL); + check_copyable_footprints(&resource_desc, 0, sub_resource_count, base_offsets[k], + NULL, row_counts, NULL, NULL); + memset(row_sizes, 0, sizeof(row_sizes)); + ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, base_offsets[k], + NULL, NULL, row_sizes, NULL); + check_copyable_footprints(&resource_desc, 0, sub_resource_count, base_offsets[k], + NULL, NULL, row_sizes, NULL); + total_size = 0; + ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, sub_resource_count, base_offsets[k], + NULL, NULL, NULL, &total_size); + check_copyable_footprints(&resource_desc, 0, sub_resource_count, base_offsets[k], + NULL, NULL, NULL, &total_size); + + for (l = 0; l < sub_resource_count; ++l) + { + vkd3d_test_set_context("resource %u, format %#x, offset %#"PRIx64", sub-resource %u", + i, resource_desc.Format, base_offsets[k], l); + + memset(layouts, 0, sizeof(layouts)); + memset(row_counts, 0, sizeof(row_counts)); + memset(row_sizes, 0, sizeof(row_sizes)); + total_size = 0; + ID3D12Device_GetCopyableFootprints(device, &resource_desc, l, 1, base_offsets[k], + layouts, row_counts, row_sizes, &total_size); + check_copyable_footprints(&resource_desc, l, 1, base_offsets[k], + layouts, row_counts, row_sizes, &total_size); + } } } } + vkd3d_test_set_context(NULL); resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; resource_desc.Alignment = 0; @@ -14874,7 +14888,7 @@ static void test_get_copyable_footprints(void) total_size = 0; ID3D12Device_GetCopyableFootprints(device, &resource_desc, 0, 1, 0, layouts, row_counts, row_sizes, &total_size); - check_copyable_footprints(&resource_desc, 0, 1, + check_copyable_footprints(&resource_desc, 0, 1, 0, layouts, row_counts, row_sizes, &total_size); for (i = 0; i < ARRAY_SIZE(invalid_descs); ++i)

1 0

Józef Kucia : vkd3d: Simplify d3d12_device_GetResourceAllocationInfo().
by Alexandre Julliard Jan. 22, 2019

Jan. 22, 2019

Module: vkd3d Branch: master Commit: 8f3db5ecef9fa4367e888edfd089f90beb0e5749 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8f3db5ecef9fa4367e888ed… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 18 10:25:49 2019 +0100 vkd3d: Simplify d3d12_device_GetResourceAllocationInfo(). 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/device.c | 64 ++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 7a6dcb6..52e7410 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2074,11 +2074,10 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour ID3D12Device *iface, D3D12_RESOURCE_ALLOCATION_INFO *info, UINT visible_mask, UINT count, const D3D12_RESOURCE_DESC *resource_descs) { - UINT64 default_alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; struct d3d12_device *device = impl_from_ID3D12Device(iface); const struct vkd3d_format *format; const D3D12_RESOURCE_DESC *desc; - bool valid = true; + UINT64 estimated_size; TRACE("iface %p, info %p, visible_mask 0x%08x, count %u, resource_descs %p.\n", iface, info, visible_mask, count, resource_descs); @@ -2099,7 +2098,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour if (FAILED(d3d12_resource_validate_desc(desc))) { WARN("Invalid resource desc.\n"); - valid = false; + goto invalid; } if (desc->Dimension == D3D12_RESOURCE_DIMENSION_BUFFER) @@ -2109,58 +2108,57 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour } else { - /* FIXME: Should we support D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT for small MSSA resources? */ - if (desc->SampleDesc.Count != 1) - default_alignment = D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT; - - if (valid && FAILED(vkd3d_get_image_allocation_info(device, desc, info))) + if (FAILED(vkd3d_get_image_allocation_info(device, desc, info))) { WARN("Failed to get allocation info for texture.\n"); - valid = false; + goto invalid; } - if (valid && info->Alignment < D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + if (info->Alignment < D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) { - if ((format = vkd3d_format_from_d3d12_resource_desc(desc, 0))) + if (!(format = vkd3d_format_from_d3d12_resource_desc(desc, 0))) { - if (desc->Width * desc->Height * desc->DepthOrArraySize * format->byte_count - > D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) - { - info->Alignment = max(info->Alignment, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT); - } - else - { - info->Alignment = max(info->Alignment, D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT); - } + WARN("Invalid format %#x.\n", desc->Format); + goto invalid; + } + + estimated_size = desc->Width * desc->Height * desc->DepthOrArraySize * format->byte_count; + if (estimated_size > D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + { + info->Alignment = max(info->Alignment, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT); } else { - WARN("Invalid format %#x.\n", desc->Format); - valid = false; + info->Alignment = max(info->Alignment, D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT); } } } - if (valid && desc->Alignment % info->Alignment) + if (desc->Alignment % info->Alignment) { WARN("Invalid resource alignment %#"PRIx64" (required %#"PRIx64").\n", desc->Alignment, info->Alignment); - valid = false; + goto invalid; } - if (valid) - { - info->SizeInBytes = align(info->SizeInBytes, info->Alignment); - } - else - { - info->SizeInBytes = ~(UINT64)0; - info->Alignment = default_alignment; - } + info->SizeInBytes = align(info->SizeInBytes, info->Alignment); TRACE("Size %#"PRIx64", alignment %#"PRIx64".\n", info->SizeInBytes, info->Alignment); return info; + +invalid: + info->SizeInBytes = ~(UINT64)0; + + /* FIXME: Should we support D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT for small MSSA resources? */ + if (desc->SampleDesc.Count != 1) + info->Alignment = D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT; + else + info->Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + + TRACE("Alignment %#"PRIx64".\n", info->Alignment); + + return info; } static D3D12_HEAP_PROPERTIES * STDMETHODCALLTYPE d3d12_device_GetCustomHeapProperties(ID3D12Device *iface,

1 0

Józef Kucia : vkd3d: Skip uninitialized descriptors in OMSetRenderTargets().
by Alexandre Julliard Jan. 22, 2019

Jan. 22, 2019

Module: vkd3d Branch: master Commit: e37cb78a22eaf6ebbcd00dd4b07f3518e2ff55e3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e37cb78a22eaf6ebbcd00dd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 18 10:25:45 2019 +0100 vkd3d: Skip uninitialized descriptors in OMSetRenderTargets(). 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/command.c | 5 +++-- tests/d3d12.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 49c3830..fa5f8fb 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3749,7 +3749,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi rtv_desc = d3d12_rtv_desc_from_cpu_handle(render_target_descriptors[i]); } - if (!rtv_desc) + if (!rtv_desc || !rtv_desc->resource) { WARN("RTV descriptor %u is not initialized.\n", i); list->views[i + 1] = VK_NULL_HANDLE; @@ -3773,7 +3773,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi if (depth_stencil_descriptor) { - if ((dsv_desc = d3d12_dsv_desc_from_cpu_handle(*depth_stencil_descriptor))) + if ((dsv_desc = d3d12_dsv_desc_from_cpu_handle(*depth_stencil_descriptor)) + && dsv_desc->resource) { d3d12_command_list_track_resource_usage(list, dsv_desc->resource); diff --git a/tests/d3d12.c b/tests/d3d12.c index 97af4c1..41704b3 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4219,6 +4219,42 @@ static void test_clear_unordered_access_view(void) #undef BUFFER_SIZE } +static void test_set_render_targets(void) +{ + ID3D12DescriptorHeap *dsv_heap, *rtv_heap; + ID3D12GraphicsCommandList *command_list; + D3D12_CPU_DESCRIPTOR_HANDLE dsv, rtv; + struct test_context context; + ID3D12Device *device; + HRESULT hr; + + if (!init_test_context(&context, NULL)) + return; + device = context.device; + command_list = context.list; + + rtv_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_RTV, 4); + dsv_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_DSV, 4); + + dsv = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(dsv_heap); + rtv = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(rtv_heap); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv, FALSE, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv, TRUE, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv, TRUE, &dsv); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, &rtv, TRUE, &dsv); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, &rtv, FALSE, &dsv); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, NULL, TRUE, &dsv); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, NULL, FALSE, &dsv); + + hr = ID3D12GraphicsCommandList_Close(command_list); + ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + + ID3D12DescriptorHeap_Release(rtv_heap); + ID3D12DescriptorHeap_Release(dsv_heap); + destroy_test_context(&context); +} + static void test_draw_instanced(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -22893,6 +22929,7 @@ START_TEST(d3d12) run_test(test_clear_depth_stencil_view); run_test(test_clear_render_target_view); run_test(test_clear_unordered_access_view); + run_test(test_set_render_targets); run_test(test_draw_instanced); run_test(test_draw_indexed_instanced); run_test(test_draw_no_descriptor_bindings);

1 0

Józef Kucia : vkd3d: Handle base offset in GetCopyableFootprints().
by Alexandre Julliard Jan. 22, 2019

Jan. 22, 2019

Module: vkd3d Branch: master Commit: aff7ff4fcf42637e4ec5da196e2837bfeca0659b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=aff7ff4fcf42637e4ec5da1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 18 10:25:46 2019 +0100 vkd3d: Handle base offset in GetCopyableFootprints(). 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/device.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 03a7a25..7c20062 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2367,9 +2367,6 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i return; } - if (base_offset) - FIXME("Ignoring base offset %#"PRIx64".\n", base_offset); - offset = 0; total = 0; for (i = 0; i < sub_resource_count; ++i) @@ -2385,7 +2382,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i if (layouts) { - layouts[i].Offset = offset; + layouts[i].Offset = base_offset + offset; layouts[i].Footprint.Format = desc->Format; layouts[i].Footprint.Width = width; layouts[i].Footprint.Height = height;

1 0

Józef Kucia : tests: Add more tests for texture allocation info.
by Alexandre Julliard Jan. 22, 2019

Jan. 22, 2019

Module: vkd3d Branch: master Commit: 49a02a41f3fb690902f7814b766260bd78ca8cc9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=49a02a41f3fb690902f7814… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 18 10:25:51 2019 +0100 tests: Add more tests for texture allocation info. 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 | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/d3d12_test_utils.h | 1 + 2 files changed, 62 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index bccface..06543e9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -22025,6 +22025,7 @@ static void test_resource_allocation_info(void) ID3D12Device *device; unsigned int i, j; ULONG refcount; + UINT64 size; static const unsigned int alignments[] = { @@ -22046,6 +22047,22 @@ static void test_resource_allocation_info(void) D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT, D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT + 1, }; + static const struct + { + unsigned int width; + unsigned int height; + unsigned int array_size; + DXGI_FORMAT format; + } + texture_tests[] = + { + { 4, 4, 1, DXGI_FORMAT_R8_UINT}, + { 8, 8, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, + {16, 16, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, + {16, 16, 6, DXGI_FORMAT_R8G8B8A8_UNORM}, + + {1024, 1024, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, + }; if (!(device = create_device())) { @@ -22086,6 +22103,50 @@ static void test_resource_allocation_info(void) } } + desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + desc.MipLevels = 1; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + desc.Flags = 0; + + for (i = 0; i < ARRAY_SIZE(texture_tests); ++i) + { + desc.Width = texture_tests[i].width; + desc.Height = texture_tests[i].height; + desc.DepthOrArraySize = texture_tests[i].array_size; + desc.Format = texture_tests[i].format; + + desc.Alignment = 0; + info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &desc); + ok(info.Alignment >= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, + "Got unexpected alignment %"PRIu64".\n", info.Alignment); + check_alignment(info.SizeInBytes, info.Alignment); + + desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &desc); + ok(info.Alignment >= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, + "Got unexpected alignment %"PRIu64".\n", info.Alignment); + check_alignment(info.SizeInBytes, info.Alignment); + + desc.Alignment = D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT; + info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &desc); + ok(info.Alignment >= D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT, + "Got unexpected alignment %"PRIu64".\n", info.Alignment); + size = desc.Width * desc.Height * desc.DepthOrArraySize * format_size(desc.Format); + if (size <= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + { + check_alignment(info.SizeInBytes, info.Alignment); + } + else + { + ok(info.SizeInBytes == ~(UINT64)0, + "Got unexpected size %"PRIu64".\n", info.SizeInBytes); + ok(info.Alignment >= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, + "Got unexpected alignment %"PRIu64".\n", info.Alignment); + } + } + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index d4265fc..6ccbc64 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -227,6 +227,7 @@ static unsigned int format_size(DXGI_FORMAT format) { case DXGI_FORMAT_UNKNOWN: case DXGI_FORMAT_A8_UNORM: + case DXGI_FORMAT_R8_UINT: return 1; case DXGI_FORMAT_R32G32B32A32_FLOAT: case DXGI_FORMAT_R32G32B32A32_UINT:

1 0

Józef Kucia : vkd3d: Allow D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT only when explicitly requested.
by Alexandre Julliard Jan. 22, 2019

Jan. 22, 2019

Module: vkd3d Branch: master Commit: ec49d3ebd264d1e3dadfd19bbc12d599da1dacae URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ec49d3ebd264d1e3dadfd19… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 18 10:25:50 2019 +0100 vkd3d: Allow D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT only when explicitly requested. 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/device.c | 12 ++++++------ libs/vkd3d/resource.c | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 52e7410..93af06c 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2077,6 +2077,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour struct d3d12_device *device = impl_from_ID3D12Device(iface); const struct vkd3d_format *format; const D3D12_RESOURCE_DESC *desc; + UINT64 requested_alignment; UINT64 estimated_size; TRACE("iface %p, info %p, visible_mask 0x%08x, count %u, resource_descs %p.\n", @@ -2101,6 +2102,9 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour goto invalid; } + requested_alignment = desc->Alignment + ? desc->Alignment : D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + if (desc->Dimension == D3D12_RESOURCE_DIMENSION_BUFFER) { info->SizeInBytes = desc->Width; @@ -2114,6 +2118,8 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour goto invalid; } + info->Alignment = max(info->Alignment, requested_alignment); + if (info->Alignment < D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) { if (!(format = vkd3d_format_from_d3d12_resource_desc(desc, 0))) @@ -2124,13 +2130,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour estimated_size = desc->Width * desc->Height * desc->DepthOrArraySize * format->byte_count; if (estimated_size > D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) - { info->Alignment = max(info->Alignment, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT); - } - else - { - info->Alignment = max(info->Alignment, D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT); - } } } diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 64d6e65..016d050 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1085,6 +1085,8 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) return E_INVALIDARG; } + /* FIXME: Validate alignment for textures. */ + return S_OK; }

1 0

Alexandre Julliard : Wine release 4.0-rc7
by Alexandre Julliard Jan. 18, 2019

Jan. 18, 2019

Module: website Branch: master Commit: 15d974e7f518bbd6f83ced9605c2e7eb899e5427 URL: https://source.winehq.org/git/website.git/?a=commit;h=15d974e7f518bbd6f83ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 18 23:51:40 2019 +0100 Wine release 4.0-rc7 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019011801.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2019011801.xml b/news/en/2019011801.xml new file mode 100644 index 0000000..9545ddc --- /dev/null +++ b/news/en/2019011801.xml @@ -0,0 +1,12 @@ +<news> +<date>January 18, 2019</date> +<title>Wine 4.0-rc7 Released</title> +<body> + The Wine development release 4.0-rc7 is now available. + <a href="{$root}/announce/4.0-rc7">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.0/wine-4.0-rc7.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

Alexandre Julliard : Release 4.0-rc7.
by Alexandre Julliard Jan. 18, 2019

Jan. 18, 2019

Module: wine Branch: master Commit: b353d7c9148414be7c928e3925f4075b1578c0a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b353d7c9148414be7c928e39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 18 23:49:47 2019 +0100 Release 4.0-rc7. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 189 +++++++++++++++++++++++++++----------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +++--- 4 files changed, 93 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b353d7c9148414be7c92…

1 0