- Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlstylesheet.c.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 95c37b8208a67a4f2b79d1947f5e16fc671d2f66 URL: https://gitlab.winehq.org/wine/wine/-/commit/95c37b8208a67a4f2b79d1947f5e16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 11:53:06 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlstylesheet.c. --- dlls/mshtml/htmlstylesheet.c | 251 ++----------------------------------------- 1 file changed, 8 insertions(+), 243 deletions(-)

1 0

Conor McCarthy : tests/d3d12: Add a separate null 'views' pointer test in test_null_vbv().
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: 7d3c286e9b99a18c7d80d85c7c27eda5df15d608 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7d3c286e9b99a18c7d80d85c7c27e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sun Apr 21 22:09:46 2024 +1000 tests/d3d12: Add a separate null 'views' pointer test in test_null_vbv(). --- tests/d3d12.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 31d6a86e..bbfa51e5 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20070,12 +20070,6 @@ static void test_null_vbv(void) }; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; - if (test_options.use_warp_device) - { - skip("Broken on WARP.\n"); - return; - } - memset(&desc, 0, sizeof(desc)); desc.no_root_signature = true; if (!init_test_context(&context, &desc)) @@ -20111,14 +20105,35 @@ static void test_null_vbv(void) vbv[1].SizeInBytes = 0; ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); - /* Calls with NULL "views" pointers should be ignored. */ - ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 4, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0); + reset_command_list(command_list, context.allocator); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + + vbv[1] = vbv[0]; + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + /* A call with a NULL "views" pointer is interpreted as a null buffer. */ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 1, 1, NULL); ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 4, 0, 0); transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + todo check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0); ID3D12Resource_Release(vb);

1 0

Conor McCarthy : tests/d3d12: Check UnalignedBlockTexturesSupported when testing GetCopyableFootprints().
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: 42d369d5950790c04e8e19672282daca5fea99c5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/42d369d5950790c04e8e19672282d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sun Apr 21 13:31:42 2024 +1000 tests/d3d12: Check UnalignedBlockTexturesSupported when testing GetCopyableFootprints(). --- tests/d3d12.c | 68 +++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 52 insertions(+), 16 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 83990ada..1100b80b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -547,6 +547,21 @@ static bool is_typed_uav_format_supported(ID3D12Device *device, DXGI_FORMAT form return format_support.Support1 & D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW; } +static bool are_unaligned_block_textures_supported(ID3D12Device *device) +{ + D3D12_FEATURE_DATA_D3D12_OPTIONS8 options; + HRESULT hr; + + if (FAILED(hr = ID3D12Device_CheckFeatureSupport(device, + D3D12_FEATURE_D3D12_OPTIONS8, &options, sizeof(options)))) + { + /* Requires Windows 11 build 10.0.22000.194. */ + return false; + } + + return options.UnalignedBlockTexturesSupported; +} + #define create_cb_root_signature(a, b, c, e) create_cb_root_signature_(__LINE__, a, b, c, e) static ID3D12RootSignature *create_cb_root_signature_(unsigned int line, ID3D12Device *device, unsigned int reg_idx, D3D12_SHADER_VISIBILITY shader_visibility, @@ -20191,6 +20206,7 @@ static void test_get_copyable_footprints(void) uint64_t row_sizes[10], total_size; D3D12_RESOURCE_DESC resource_desc; unsigned int sub_resource_count; + bool unaligned_block_textures; ID3D12Device8 *device8; unsigned int i, j, k; ID3D12Device *device; @@ -20274,6 +20290,10 @@ static void test_get_copyable_footprints(void) {D3D12_RESOURCE_DIMENSION_TEXTURE2D, 0, 4, 4, 1, 1, DXGI_FORMAT_R32_UINT, {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_NONE}, 0, 2, }, + { + {D3D12_RESOURCE_DIMENSION_TEXTURE2D, 3, 4, 4, 1, 1, DXGI_FORMAT_R32_UINT, + {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_NONE}, 0, 1, + }, { {D3D12_RESOURCE_DIMENSION_TEXTURE2D, 0, 3, 1, 1, 2, DXGI_FORMAT_BC1_UNORM, {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_NONE}, 0, 2, @@ -20291,7 +20311,7 @@ static void test_get_copyable_footprints(void) {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_NONE}, 0, 1, }, { - {D3D12_RESOURCE_DIMENSION_TEXTURE3D, 3, 2, 2, 2, 2, DXGI_FORMAT_BC1_UNORM, + {D3D12_RESOURCE_DIMENSION_TEXTURE3D, 0, 2, 2, 2, 2, DXGI_FORMAT_BC1_UNORM, {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_NONE}, 0, 1, }, { @@ -20304,12 +20324,6 @@ static void test_get_copyable_footprints(void) }, }; - if (test_options.use_warp_device) - { - skip("Broken on WARP.\n"); - return; - } - if (!(device = create_device())) { skip("Failed to create device.\n"); @@ -20460,9 +20474,15 @@ static void test_get_copyable_footprints(void) ID3D12Device8_Release(device8); } + unaligned_block_textures = are_unaligned_block_textures_supported(device); + for (i = 0; i < ARRAY_SIZE(invalid_descs); ++i) { + bool expect_success; + resource_desc = invalid_descs[i].resource_desc; + /* If supported, succeeds for block compressed formats and returns aligned width and height. */ + expect_success = unaligned_block_textures && format_block_width(resource_desc.Format) > 1; memset(layouts, 0, sizeof(layouts)); memset(row_counts, 0, sizeof(row_counts)); @@ -20476,18 +20496,34 @@ static void test_get_copyable_footprints(void) { const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *l = &layouts[j]; - ok(l->Offset == ~(uint64_t)0, "Got offset %"PRIu64".\n", l->Offset); - ok(l->Footprint.Format == ~(DXGI_FORMAT)0, "Got format %#x.\n", l->Footprint.Format); - ok(l->Footprint.Width == ~0u, "Got width %u.\n", l->Footprint.Width); - ok(l->Footprint.Height == ~0u, "Got height %u.\n", l->Footprint.Height); - ok(l->Footprint.Depth == ~0u, "Got depth %u.\n", l->Footprint.Depth); - ok(l->Footprint.RowPitch == ~0u, "Got row pitch %u.\n", l->Footprint.RowPitch); + vkd3d_test_push_context("resource %u, subresource %u", i, j); + + if (expect_success) + { + resource_desc.Width = align(resource_desc.Width, 4); + resource_desc.Height = align(resource_desc.Height, 4); + todo + check_copyable_footprints(&resource_desc, 0, invalid_descs[i].sub_resource_count, 0, + layouts, row_counts, row_sizes, &total_size); + } + else + { + ok(l->Offset == ~(uint64_t)0, "Got offset %"PRIu64".\n", l->Offset); + ok(l->Footprint.Format == ~(DXGI_FORMAT)0, "Got format %#x.\n", l->Footprint.Format); + ok(l->Footprint.Width == ~0u, "Got width %u.\n", l->Footprint.Width); + ok(l->Footprint.Height == ~0u, "Got height %u.\n", l->Footprint.Height); + ok(l->Footprint.Depth == ~0u, "Got depth %u.\n", l->Footprint.Depth); + ok(l->Footprint.RowPitch == ~0u, "Got row pitch %u.\n", l->Footprint.RowPitch); + + ok(row_counts[j] == ~0u, "Got row count %u.\n", row_counts[j]); + ok(row_sizes[j] == ~(uint64_t)0, "Got row size %"PRIu64".\n", row_sizes[j]); + } - ok(row_counts[j] == ~0u, "Got row count %u.\n", row_counts[j]); - ok(row_sizes[j] == ~(uint64_t)0, "Got row size %"PRIu64".\n", row_sizes[j]); + vkd3d_test_pop_context(); } - ok(total_size == ~(uint64_t)0, "Got total size %"PRIu64".\n", total_size); + if (!expect_success) + ok(total_size == ~(uint64_t)0, "Got total size %"PRIu64".\n", total_size); } refcount = ID3D12Device_Release(device);

1 0

Conor McCarthy : tests/d3d12: Use get_cpu_sampler_handle() for the sampler heap in test_unbounded_samplers().
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: fd416b492c4ac4fa0fddc3470a724624463995b6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fd416b492c4ac4fa0fddc3470a724… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Apr 20 15:20:38 2024 +1000 tests/d3d12: Use get_cpu_sampler_handle() for the sampler heap in test_unbounded_samplers(). --- tests/d3d12.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index acd263c9..31d6a86e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -37440,7 +37440,7 @@ static void test_unbounded_samplers(void) sampler_desc.AddressU = (i & 1) ? D3D12_TEXTURE_ADDRESS_MODE_CLAMP : D3D12_TEXTURE_ADDRESS_MODE_WRAP; sampler_desc.AddressV = (i & 2) ? D3D12_TEXTURE_ADDRESS_MODE_CLAMP : D3D12_TEXTURE_ADDRESS_MODE_WRAP; sampler_desc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_WRAP; - ID3D12Device_CreateSampler(device, &sampler_desc, get_cpu_descriptor_handle(&context, sampler_heap, i)); + ID3D12Device_CreateSampler(device, &sampler_desc, get_cpu_sampler_handle(&context, sampler_heap, i)); } ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature);

1 0

Conor McCarthy : tests/d3d12: Ensure stream output BufferFilledSizeLocation is always valid.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: cc1877dadbc3476751a1946086b78a904228e0ee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cc1877dadbc3476751a1946086b78… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Apr 20 15:19:57 2024 +1000 tests/d3d12: Ensure stream output BufferFilledSizeLocation is always valid. --- tests/d3d12.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1100b80b..acd263c9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -30793,7 +30793,7 @@ static void test_domain_shader_inputs(void) bug_if(is_mvk_device(context.device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - so_buffer = create_default_buffer(context.device, 1024, + so_buffer = create_default_buffer(context.device, 2048, D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_STREAM_OUT); sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer); sobv.SizeInBytes = 1024; @@ -30978,7 +30978,7 @@ static void test_domain_shader_one_patch_constant_input(void) bug_if(is_mvk_device(context.device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - so_buffer = create_default_buffer(context.device, 1024, + so_buffer = create_default_buffer(context.device, 2048, D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_STREAM_OUT); sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer); sobv.SizeInBytes = 1024;

1 0

Conor McCarthy : tests/d3d12: Do not test 3D depth textures in test_get_copyable_footprints().
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: 42eee382ec8e4b99c07593fb9051a38c99422abf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/42eee382ec8e4b99c07593fb9051a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Apr 20 13:20:02 2024 +1000 tests/d3d12: Do not test 3D depth textures in test_get_copyable_footprints(). --- tests/d3d12.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index de7db0d7..2e69cb71 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20229,6 +20229,7 @@ static void test_get_copyable_footprints(void) { DXGI_FORMAT format; bool is_compressed; + bool is_depth; } formats[] = { @@ -20244,8 +20245,8 @@ static void test_get_copyable_footprints(void) {DXGI_FORMAT_BC6H_UF16, true}, {DXGI_FORMAT_BC6H_SF16, true}, {DXGI_FORMAT_BC7_UNORM, true}, - {DXGI_FORMAT_D32_FLOAT, false}, - {DXGI_FORMAT_D24_UNORM_S8_UINT, false}, + {DXGI_FORMAT_D32_FLOAT, false, true}, + {DXGI_FORMAT_D24_UNORM_S8_UINT, false, true}, }; static const uint64_t base_offsets[] = { @@ -20328,6 +20329,9 @@ static void test_get_copyable_footprints(void) { if (formats[j].is_compressed && !resources[i].test_with_compressed) continue; + /* Depth formats are not supported for 3D textures in any current feature level including 12.1. */ + if (formats[j].is_depth && resources[i].dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + continue; if (is_buffer && j > 0) continue;

1 0

Conor McCarthy : tests/d3d12: Set the descriptor heaps for the draw call in test_graphics_uav_counters().
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: 23881bad7a655f02a6d2f20406d5c0d5bbb88e91 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/23881bad7a655f02a6d2f20406d5c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue May 21 00:23:53 2024 +1000 tests/d3d12: Set the descriptor heaps for the draw call in test_graphics_uav_counters(). --- tests/d3d12.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2c044322..376538ee 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -23962,6 +23962,7 @@ static void test_graphics_uav_counters(void) ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &gpu_heap); ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(gpu_heap)); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);

1 0

Conor McCarthy : tests/d3d12: Test format D32_FLOAT_S8X24_UINT in test_get_copyable_footprints().
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: 0daba96025558e2a4b96b00c88ad2a4cff8e6b35 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0daba96025558e2a4b96b00c88ad2… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 22 16:32:21 2024 +1000 tests/d3d12: Test format D32_FLOAT_S8X24_UINT in test_get_copyable_footprints(). --- tests/d3d12.c | 3 ++- tests/d3d12_test_utils.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 820473ee..83990ada 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20248,6 +20248,7 @@ static void test_get_copyable_footprints(void) {DXGI_FORMAT_BC7_UNORM, true}, {DXGI_FORMAT_D32_FLOAT, false, true}, {DXGI_FORMAT_D24_UNORM_S8_UINT, false, true}, + {DXGI_FORMAT_D32_FLOAT_S8X24_UINT, false, true}, }; static const uint64_t base_offsets[] = { @@ -20349,7 +20350,7 @@ static void test_get_copyable_footprints(void) sub_resource_count = resource_desc.MipLevels; if (resources[i].dimension != D3D12_RESOURCE_DIMENSION_TEXTURE3D) sub_resource_count *= resource_desc.DepthOrArraySize; - if (resource_desc.Format == DXGI_FORMAT_D24_UNORM_S8_UINT) + if (format_plane_count(resource_desc.Format) > 1) { /* FIXME: we require D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL here for DS formats but windows doesn't. */ if (!vkd3d_test_platform_is_windows()) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 408adc4d..28cf2aad 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -314,6 +314,7 @@ static unsigned int format_size(DXGI_FORMAT format) case DXGI_FORMAT_R8G8_UNORM: return 16; case DXGI_FORMAT_R16G16B16A16_TYPELESS: + case DXGI_FORMAT_D32_FLOAT_S8X24_UINT: return 8; case DXGI_FORMAT_R32_TYPELESS: case DXGI_FORMAT_D32_FLOAT:

1 0

Conor McCarthy : tests/d3d12: Do not clear UAVs via a structured view.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: dcc715b4d1c0e33fcab6aed345bd17b3d4a56e19 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dcc715b4d1c0e33fcab6aed345bd1… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Apr 20 13:21:18 2024 +1000 tests/d3d12: Do not clear UAVs via a structured view. --- tests/d3d12.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2e69cb71..2c044322 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -23928,15 +23928,13 @@ static void test_graphics_uav_counters(void) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, 0, NULL, &ps, NULL); memset(&uav_desc, 0, sizeof(uav_desc)); - uav_desc.Format = DXGI_FORMAT_UNKNOWN; + uav_desc.Format = DXGI_FORMAT_R32_UINT; uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER; uav_desc.Buffer.NumElements = 64; - uav_desc.Buffer.StructureByteStride = sizeof(uint32_t); uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE; ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc, get_cpu_descriptor_handle(&context, cpu_heap, 0)); - uav_desc.Buffer.CounterOffsetInBytes = D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT; - ID3D12Device_CreateUnorderedAccessView(device, buffer, counter_buffer, &uav_desc, + ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc, get_cpu_descriptor_handle(&context, gpu_heap, 0)); ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &gpu_heap); @@ -23947,6 +23945,12 @@ static void test_graphics_uav_counters(void) buffer, clear_value, 0, NULL); uav_barrier(command_list, buffer); + uav_desc.Format = DXGI_FORMAT_UNKNOWN; + uav_desc.Buffer.StructureByteStride = sizeof(uint32_t); + uav_desc.Buffer.CounterOffsetInBytes = D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT; + ID3D12Device_CreateUnorderedAccessView(device, buffer, counter_buffer, &uav_desc, + get_cpu_descriptor_handle(&context, gpu_heap, 0)); + counter = 0; upload_buffer_data(counter_buffer, uav_desc.Buffer.CounterOffsetInBytes, sizeof(counter), &counter, queue, command_list);

1 0

Conor McCarthy : tests/d3d12: Check the correct depth/stencil plane format and alignment in test_get_copyable_footprints().
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: f6db3330c89c60debe3cb10722fcc34fb820641e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f6db3330c89c60debe3cb10722fcc… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 22 16:29:40 2024 +1000 tests/d3d12: Check the correct depth/stencil plane format and alignment in test_get_copyable_footprints(). --- tests/d3d12.c | 57 ++++++++++++++++++++++++------------------------ tests/d3d12_test_utils.h | 34 +++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 28 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 376538ee..820473ee 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -931,26 +931,7 @@ static void test_check_feature_support(void) { vkd3d_test_push_context("format %#x", format); - switch (format) - { - case DXGI_FORMAT_R32G8X24_TYPELESS: - case DXGI_FORMAT_D32_FLOAT_S8X24_UINT: - case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS: - case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT: - case DXGI_FORMAT_D24_UNORM_S8_UINT: - case DXGI_FORMAT_R24G8_TYPELESS: - case DXGI_FORMAT_R24_UNORM_X8_TYPELESS: - case DXGI_FORMAT_X24_TYPELESS_G8_UINT: - case DXGI_FORMAT_NV12: - case DXGI_FORMAT_P010: - case DXGI_FORMAT_P016: - case DXGI_FORMAT_NV11: - expected_plane_count = 2; - break; - default: - expected_plane_count = 1; - break; - } + expected_plane_count = format_plane_count(format); is_todo = format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP || format == DXGI_FORMAT_R8G8_B8G8_UNORM @@ -20137,32 +20118,46 @@ static void check_copyable_footprints_(unsigned int line, const D3D12_RESOURCE_D const uint64_t *row_sizes, uint64_t *total_size) { unsigned int miplevel, width, height, depth, row_count, row_size, row_pitch; + unsigned int i, sub_resources_per_plane, plane_count, plane_idx; + DXGI_FORMAT expected_format = desc->Format; uint64_t offset, size, total; - unsigned int i; + bool format_is_ds; + + sub_resources_per_plane = desc->MipLevels + * (desc->Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE3D ? desc->DepthOrArraySize : 1); + plane_count = format_plane_count(desc->Format); + format_is_ds = plane_count > 1; offset = total = 0; for (i = 0; i < sub_resource_count; ++i) { + plane_idx = (sub_resource_idx + i) / sub_resources_per_plane; + expected_format = format_get_subresource_plane_format(desc->Format, plane_idx, plane_count); + miplevel = (sub_resource_idx + i) % desc->MipLevels; - width = align(max(1, desc->Width >> miplevel), format_block_width(desc->Format)); - height = align(max(1, desc->Height >> miplevel), format_block_height(desc->Format)); + width = align(max(1, desc->Width >> miplevel), format_block_width(expected_format)); + height = align(max(1, desc->Height >> miplevel), format_block_height(expected_format)); depth = desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D ? desc->DepthOrArraySize : 1; depth = max(1, depth >> miplevel); - row_count = height / format_block_height(desc->Format); - row_size = (width / format_block_width(desc->Format)) * format_size(desc->Format); - row_pitch = align(row_size, D3D12_TEXTURE_DATA_PITCH_ALIGNMENT); + row_count = height / format_block_height(expected_format); + row_size = (width / format_block_width(expected_format)) * format_size(expected_format); + /* D3D12 requires double the alignment for dual planes. */ + row_pitch = align(row_size, D3D12_TEXTURE_DATA_PITCH_ALIGNMENT * plane_count); if (layouts) { const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *l = &layouts[i]; const D3D12_SUBRESOURCE_FOOTPRINT *f = &l->Footprint; + todo_if(format_is_ds && l->Offset != base_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); + todo_if(format_is_ds) + ok_(line)(f->Format == expected_format, "Got format %#x, expected %#x.\n", f->Format, expected_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); ok_(line)(f->Depth == depth, "Got depth %u, expected %u.\n", f->Depth, depth); + todo_if(format_is_ds) ok_(line)(f->RowPitch == row_pitch, "Got row pitch %u, expected %u.\n", f->RowPitch, row_pitch); } @@ -20170,17 +20165,23 @@ static void check_copyable_footprints_(unsigned int line, const D3D12_RESOURCE_D ok_(line)(row_counts[i] == row_count, "Got row count %u, expected %u.\n", row_counts[i], row_count); if (row_sizes) + { + todo_if(format_is_ds && (plane_idx || format_size(desc->Format) > 4)) ok_(line)(row_sizes[i] == row_size, "Got row size %"PRIu64", expected %u.\n", row_sizes[i], row_size); + } size = max(0, row_count - 1) * row_pitch + row_size; - size = max(0, depth - 1) * align(size, D3D12_TEXTURE_DATA_PITCH_ALIGNMENT) + size; + size = max(0, depth - 1) * align(size, D3D12_TEXTURE_DATA_PITCH_ALIGNMENT * plane_count) + size; total = offset + size; offset = align(total, D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT); } if (total_size) + { + todo_if(format_is_ds && *total_size != total) ok_(line)(*total_size == total, "Got total size %"PRIu64", expected %"PRIu64".\n", *total_size, total); + } } static void test_get_copyable_footprints(void) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index e24b3fa5..408adc4d 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -337,6 +337,7 @@ static unsigned int format_size(DXGI_FORMAT format) return 2; case DXGI_FORMAT_UNKNOWN: case DXGI_FORMAT_A8_UNORM: + case DXGI_FORMAT_R8_TYPELESS: case DXGI_FORMAT_R8_UINT: case DXGI_FORMAT_R8_UNORM: return 1; @@ -416,6 +417,39 @@ static inline unsigned int format_block_height(DXGI_FORMAT format) } } +static inline unsigned int format_plane_count(DXGI_FORMAT format) +{ + switch (format) + { + case DXGI_FORMAT_R32G8X24_TYPELESS: + case DXGI_FORMAT_D32_FLOAT_S8X24_UINT: + case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS: + case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT: + case DXGI_FORMAT_D24_UNORM_S8_UINT: + case DXGI_FORMAT_R24G8_TYPELESS: + case DXGI_FORMAT_R24_UNORM_X8_TYPELESS: + case DXGI_FORMAT_X24_TYPELESS_G8_UINT: + case DXGI_FORMAT_NV12: + case DXGI_FORMAT_P010: + case DXGI_FORMAT_P016: + case DXGI_FORMAT_NV11: + return 2; + default: + return 1; + } +} + +static inline DXGI_FORMAT format_get_subresource_plane_format(DXGI_FORMAT format, unsigned int plane_idx, + unsigned int plane_count) +{ + assert(plane_idx < plane_count && plane_count >= 1 && plane_count <= 2); + + if (plane_count < 2) + return format; + + return plane_idx ? DXGI_FORMAT_R8_TYPELESS : DXGI_FORMAT_R32_TYPELESS; +} + struct d3d12_resource_readback { struct resource_readback rb;

1 0