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

[PATCH vkd3d] README: Expand on building and using vkd3d
by Andrew Eikum Jan. 22, 2019

Jan. 22, 2019

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- README | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/README b/README index f353c36..0abaa08 100644 --- a/README +++ b/README @@ -4,3 +4,31 @@ The vkd3d 3D Graphics Library Vkd3d is a 3D graphics library built on top of Vulkan. It has an API very similar, but not identical, to Direct3D 12. + +============== +Building vkd3d +============== + +Vkd3d depends on SPIRV-Headers and Vulkan-Headers (>= 1.1.88). + +Vkd3d builds some of its headers from IDL files. If you are using the release +tarballs, then these headers are pre-built and are included. If you are +building from git, then they will be built at build-time using widl. By +default, vkd3d will use the widl found in PATH. If widl is not available or +is not recent (>= 3.0 or so), then you can build Wine with "make tools/widl" +to avoid building all of Wine. You can then point vkd3d's configure at that +widl binary with WIDL=/path/to/widl. + +=========== +Using vkd3d +=========== + +Vkd3d can be used by projects that target D3D12 as a drop-in replacement at +build-time with some modest source modifications. Or it can be used by Wine to +run Windows applications that target D3D12. + +To build Wine with vkd3d for D3D12 support, first build and install vkd3d (see +above for widl requirement) and then build Wine. Wine's configure should pick +up on vkd3d if it is installed to the system, or you can use PKG_CONFIG_PATH +to point Wine's configure script at vkd3d's pc-files located in a non-standard +installation. -- 2.20.1

2 2

[PATCH vkd3d 2/7] vkd3d: Handle base offset in GetCopyableFootprints().
by Józef Kucia Jan. 22, 2019

Jan. 22, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 03a7a25bab8e..7c2006232795 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; -- 2.19.2

2 1

[PATCH vkd3d 7/7] tests: Add more tests for texture allocation info.
by Józef Kucia Jan. 22, 2019

Jan. 22, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 bccface6de51..06543e9152f0 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 d4265fc893c8..6ccbc64981b9 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: -- 2.19.2

2 1

[PATCH vkd3d 6/7] vkd3d: Allow D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT only when explicitly requested.
by Józef Kucia Jan. 22, 2019

Jan. 22, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 52e741053bea..93af06cb1b5b 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 64d6e658bd5a..016d050998b0 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; } -- 2.19.2

2 1

[PATCH vkd3d 3/7] tests: Test GetCopyableFootprints() with base offset.
by Józef Kucia Jan. 22, 2019

Jan. 22, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 94 +++++++++++++++++++++++++++++---------------------- 1 file changed, 54 insertions(+), 40 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 41704b3c076a..bccface6de51 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) -- 2.19.2

2 1

[PATCH vkd3d 5/7] vkd3d: Simplify d3d12_device_GetResourceAllocationInfo().
by Józef Kucia Jan. 22, 2019

Jan. 22, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 7a6dcb68862d..52e741053bea 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,57 +2108,56 @@ 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; } -- 2.19.2

2 1

[PATCH vkd3d 4/7] vkd3d: Allow D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT only for small textures.
by Józef Kucia Jan. 22, 2019

Jan. 22, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> 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> --- 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 7c2006232795..7a6dcb68862d 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) -- 2.19.2

2 1

[PATCH vkd3d 1/7] vkd3d: Skip uninitialized descriptors in OMSetRenderTargets().
by Józef Kucia Jan. 22, 2019

Jan. 22, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 49c3830030ee..fa5f8fb2ef4d 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 97af4c1a9f67..41704b3c076a 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); -- 2.19.2

2 1

[PATCH] comdlg32: Improve PRINT32 dialog
by Alistair Leslie-Hughes Jan. 21, 2019

Jan. 21, 2019

- Corrected TAB order to be the same as windows - Moved Help button to Bottom Right, align top with OK/Cancel buttons. - Moved Print to File Checkbox to be in the same position as windows. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/comdlg32/comdlg32.rc | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc index 22a5a93..04ce3da9 100644 --- a/dlls/comdlg32/comdlg32.rc +++ b/dlls/comdlg32/comdlg32.rc @@ -354,40 +354,37 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK CAPTION "Print" FONT 8, "MS Shell Dlg" -{ - DEFPUSHBUTTON "OK", IDOK, 176,164, 50,14, WS_GROUP | BS_DEFPUSHBUTTON - PUSHBUTTON "Cancel", IDCANCEL, 230,164, 50,14, WS_GROUP - PUSHBUTTON "&Help", pshHelp, 50, 161, 50,14, WS_GROUP - +BEGIN GROUPBOX "Printer", grp4, 8, 4, 272,84, WS_GROUP - CONTROL "Print to fi&le", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 + COMBOBOX cmb4,54,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Properties", psh2, 212, 17, 60,14, WS_GROUP + CONTROL "Print to fi&le",chx1,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,213,71,60,12 LTEXT "&Name:", stc6, 16, 20, 36,8 - COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Status:", stc8, 16, 36, 47,10, SS_NOPREFIX - LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Type:", stc7, 16, 48, 47,10, SS_NOPREFIX - LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Where:", stc10, 16, 60, 47,10, SS_NOPREFIX - LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Comment:", stc9, 16, 72, 47,10, SS_NOPREFIX - LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - - GROUPBOX "Copies", grp2, 160, 92, 120,64, WS_GROUP - LTEXT "Number of &copies:",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE - CONTROL "C&ollate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 - EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - + LTEXT "Status:",stc8,16,36,36,10,SS_NOPREFIX + LTEXT "",stc12,SS_LEFTNOWORDWRAP | SS_NOPREFIX,54,36,152,10 + LTEXT "Type:",stc7,16,48,36,10,SS_NOPREFIX + LTEXT "",stc11,SS_LEFTNOWORDWRAP | SS_NOPREFIX,54,48,152,10 + LTEXT "Where:",stc10,16,60,36,10,SS_NOPREFIX + LTEXT "",stc14,SS_LEFTNOWORDWRAP | SS_NOPREFIX,54,60,152,10 + LTEXT "Comment:",stc9,16,72,36,10,SS_NOPREFIX + LTEXT "",stc13,SS_LEFTNOWORDWRAP | SS_NOPREFIX,54,72,152,10 GROUPBOX "Print range", grp1, 8,92, 144,64, WS_GROUP CONTROL "&All", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 CONTROL "Pa&ges", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 CONTROL "&Selection", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "&from:", stc2, 52,124, 20,8 + RTEXT "&from:", stc2, 52,122, 20,8 RTEXT "&to:", stc3, 99,124, 20,8 -} + GROUPBOX "Copies", grp2, 160, 92, 120,64, WS_GROUP + LTEXT "Number of &copies:",stc5,168,105,68,8 + ICON "",ico3,170,131,20,20,SS_CENTERIMAGE | WS_GROUP + CONTROL "C&ollate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER + DEFPUSHBUTTON "OK",IDOK,176,164,50,14,WS_GROUP + PUSHBUTTON "Cancel",IDCANCEL,230,164,50,14,WS_GROUP + PUSHBUTTON "&Help",pshHelp,8,164,50,14,WS_GROUP +END PRINT32_SETUP DIALOG 32, 32, 288, 178 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK -- 1.9.1

1 0

[PATCH] hlink/tests: Fix some memory leaks (Valgrind).
by Sven Baars Jan. 21, 2019

Jan. 21, 2019

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/hlink/tests/browse_ctx.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index 319352500c..95a72d7772 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -165,16 +165,12 @@ static void test_GetObject(void) { IHlinkBrowseContext *bc; IMoniker *dummy; - IBindCtx *bindctx; IUnknown *unk; WCHAR one[] = {'1',0}; WCHAR five[] = {'5',0}; DWORD cookie; HRESULT hres; - hres = CreateBindCtx(0, &bindctx); - ok(hres == S_OK, "CreateBindCtx() failed: 0x%08x\n", hres); - hres = CreateItemMoniker(one, five, &dummy); ok(hres == S_OK, "CreateItemMoniker() failed: 0x%08x\n", hres); @@ -198,6 +194,7 @@ static void test_GetObject(void) ok(hres == MK_E_UNAVAILABLE, "expected MK_E_UNAVAILABLE, got 0x%08x\n", hres); IHlinkBrowseContext_Release(bc); + IMoniker_Release(dummy); } START_TEST(browse_ctx) -- 2.17.1

1 0