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

[PATCH] testbot/TestLauncher: Add an Emacs directive to get 3-space indentation.
by Francois Gouget March 14, 2019

March 14, 2019

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Yep, except for those two lines it's 3-space indent all the way down! testbot/src/TestLauncher/TestLauncher.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 15929c50..783dbaba 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset: 3; indent-tabs-mode: nil -*- */ /* * Verifies that the dlls needed for the test are present. * @@ -34,8 +35,8 @@ static const char *LocationFile; static unsigned LocationLine; static void _SetErrorLocation(const char* file, int line) { - LocationFile = file; - LocationLine = line; + LocationFile = file; + LocationLine = line; } #ifdef __GNUC__ -- 2.20.1

1 0

[PATCH] testbot: Fix Collection::Validate() errors for new Items.
by Francois Gouget March 14, 2019

March 14, 2019

New Items don't have a full key yet so it cannot be put in the error message. Instead indicate the error happened on a new object and give its partial key. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index c110c98b..1fe1481f 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -495,11 +495,16 @@ sub Validate($) { if ($Item->GetIsNew() || $Item->GetIsModified()) { - (my $ErrProperty, my $ErrMessage) = $Item->Validate(); - if (defined($ErrMessage)) + my ($ErrProperty, $ErrMessage) = $Item->Validate(); + if (defined $ErrMessage) { - return ($Item->GetKey(), $ErrProperty, "$ErrMessage for " . - $self->GetItemName() . " " . $Item->GetFullKey()); + my $Key = $Item->GetKey(); + my $FullKey = $Item->GetFullKey(); + if (defined $FullKey) + { + return ($Key, $ErrProperty, "$ErrMessage for ". $self->GetItemName() ." $FullKey"); + } + return ($Key, $ErrProperty, "$ErrMessage for new ". $self->GetItemName() ." $Key"); } if ($Item->GetIsNew()) { -- 2.20.1

1 0

[PATCH] testbot/WineSendLog: We are testing more than Windows now.
by Francois Gouget March 14, 2019

March 14, 2019

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 1d13454f..28644fb8 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -342,7 +342,7 @@ EOF Hi, -While running your changed tests on Windows, I think I found new failures. +While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? -- 2.20.1

1 0

[PATCH] testbot/SetWinLocale: Fix setting the VM description.
by Francois Gouget March 14, 2019

March 14, 2019

There is no $Suffix variable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/SetWinLocale | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/scripts/SetWinLocale b/testbot/scripts/SetWinLocale index e9d024f8..5ca05071 100755 --- a/testbot/scripts/SetWinLocale +++ b/testbot/scripts/SetWinLocale @@ -649,7 +649,7 @@ if ($OptRefresh) $VM->IdleSnapshot($BaseVM->IdleSnapshot ."_$VMLocale"); $VM->Hostname($BaseVM->Hostname); - my $Description = $BaseVM->Description ." ". LocaleName($Suffix); + my $Description = $BaseVM->Description ." ". LocaleName($VMLocale); my $PropertyDescriptor = $VMs->GetPropertyDescriptorByName("Description"); if ($PropertyDescriptor->GetMaxLength() < length($Description)) { -- 2.20.1

1 0

[PATCH vkd3d 09/11] vkd3d: Validate box in d3d12_command_list_CopyTextureRegion().
by Józef Kucia March 14, 2019

March 14, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 13 +++++++++++++ libs/vkd3d/utils.c | 10 ++++++++++ libs/vkd3d/vkd3d_private.h | 1 + tests/d3d12.c | 5 +++++ 4 files changed, 29 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4cd64b030249..35c2be41716d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2713,6 +2713,13 @@ static void d3d12_command_list_copy_incompatible_texture_region(struct d3d12_com VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &buffer_image_copy)); } +static bool validate_d3d12_box(const D3D12_BOX *box) +{ + return box->right > box->left + && box->bottom > box->top + && box->back > box->front; +} + static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12GraphicsCommandList1 *iface, const D3D12_TEXTURE_COPY_LOCATION *dst, UINT dst_x, UINT dst_y, UINT dst_z, const D3D12_TEXTURE_COPY_LOCATION *src, const D3D12_BOX *src_box) @@ -2727,6 +2734,12 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic TRACE("iface %p, dst %p, dst_x %u, dst_y %u, dst_z %u, src %p, src_box %p.\n", iface, dst, dst_x, dst_y, dst_z, src, src_box); + if (src_box && !validate_d3d12_box(src_box)) + { + WARN("Empty box %s.\n", debug_d3d12_box(src_box)); + return; + } + vk_procs = &list->device->vk_procs; dst_resource = unsafe_impl_from_ID3D12Resource(dst->pResource); diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index e8ebd2cfead9..14b79337ca76 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -322,6 +322,16 @@ HRESULT return_interface(void *iface, REFIID iface_iid, return hr; } +const char *debug_d3d12_box(const D3D12_BOX *box) +{ + if (!box) + return "(null)"; + + return vkd3d_dbg_sprintf("(%u, %u, %u)-(%u, %u, %u)", + box->left, box->top, box->front, + box->right, box->bottom, box->back); +} + const char *debug_vk_extent_3d(VkExtent3D extent) { return vkd3d_dbg_sprintf("(%u, %u, %u)", diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index b4727a20a4df..a6ada4b4e68f 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1015,6 +1015,7 @@ static inline bool is_cpu_accessible_heap(const D3D12_HEAP_PROPERTIES *propertie HRESULT return_interface(void *iface, REFIID iface_iid, REFIID requested_iid, void **object) DECLSPEC_HIDDEN; +const char *debug_d3d12_box(const D3D12_BOX *box) DECLSPEC_HIDDEN; const char *debug_vk_extent_3d(VkExtent3D extent) DECLSPEC_HIDDEN; const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags) DECLSPEC_HIDDEN; const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags) DECLSPEC_HIDDEN; diff --git a/tests/d3d12.c b/tests/d3d12.c index 53c78f99f9fb..00b9e7be2e85 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20933,6 +20933,11 @@ static void test_copy_texture_buffer(void) ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 32, 0, 0, &src_location, &box); + /* empty box */ + set_box(&box, 128, 0, 0, 32, 32, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 0, 0, &src_location, &box); + for (i = 0; i < ARRAY_SIZE(dst_buffers); ++i) { transition_resource_state(command_list, dst_buffers[i], -- 2.19.2

1 0

[PATCH vkd3d 08/11] tests: Add more tests for copying data from textures to buffers.
by Józef Kucia March 14, 2019

March 14, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 182213610d69..53c78f99f9fb 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20844,6 +20844,177 @@ static void test_copy_texture(void) destroy_test_context(&context); } +static void test_copy_texture_buffer(void) +{ + D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; + ID3D12GraphicsCommandList *command_list; + D3D12_SUBRESOURCE_DATA texture_data; + ID3D12Resource *dst_buffers[4]; + struct test_context_desc desc; + struct test_context context; + struct resource_readback rb; + ID3D12Resource *src_texture; + unsigned int got, expected; + ID3D12CommandQueue *queue; + ID3D12Device *device; + unsigned int x, y; + unsigned int *ptr; + unsigned int i; + D3D12_BOX box; + + memset(&desc, 0, sizeof(desc)); + desc.no_render_target = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + ptr = calloc(64 * 32, sizeof(*ptr)); + ok(ptr, "Failed to allocate memory.\n"); + + for (i = 0; i < 64 * 32; ++i) + ptr[i] = i; + + src_texture = create_default_texture(device, + 64, 32, DXGI_FORMAT_R32_UINT, 0, D3D12_RESOURCE_STATE_COPY_DEST); + texture_data.pData = ptr; + texture_data.RowPitch = 64 * sizeof(*ptr); + texture_data.SlicePitch = texture_data.RowPitch * 32; + upload_texture_data(src_texture, &texture_data, 1, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, src_texture, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + free(ptr); + + for (i = 0; i < ARRAY_SIZE(dst_buffers); ++i) + { + dst_buffers[i] = create_default_buffer(device, + 64 * 32 * sizeof(*ptr), 0, D3D12_RESOURCE_STATE_COPY_DEST); + } + + dst_location.pResource = dst_buffers[0]; + dst_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT; + dst_location.PlacedFootprint.Offset = 0; + dst_location.PlacedFootprint.Footprint.Format = DXGI_FORMAT_R32_UINT; + dst_location.PlacedFootprint.Footprint.Width = 64; + dst_location.PlacedFootprint.Footprint.Height = 32; + dst_location.PlacedFootprint.Footprint.Depth = 1; + dst_location.PlacedFootprint.Footprint.RowPitch = 64 * sizeof(*ptr); + + src_location.pResource = src_texture; + src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; + src_location.SubresourceIndex = 0; + + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 0, 0, &src_location, NULL); + + dst_location.pResource = dst_buffers[1]; + for (y = 0; y < 32; ++y) + { + set_box(&box, 0, y, 0, 64, y + 1, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 31 - y, 0, &src_location, &box); + } + + dst_location.pResource = dst_buffers[2]; + for (x = 0; x < 64; ++x) + { + set_box(&box, x, 0, 0, x + 1, 32, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 63 - x, 0, 0, &src_location, &box); + } + + dst_location.pResource = dst_buffers[3]; + set_box(&box, 0, 0, 0, 32, 32, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 0, 0, &src_location, &box); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 32, 0, 0, &src_location, &box); + + for (i = 0; i < ARRAY_SIZE(dst_buffers); ++i) + { + transition_resource_state(command_list, dst_buffers[i], + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + } + + got = expected = 0; + get_buffer_readback_with_command_list(dst_buffers[0], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + for (i = 0; i < 64 * 32; ++i) + { + got = get_readback_uint(&rb, i, 0, 0); + expected = i; + + if (got != expected) + break; + } + release_resource_readback(&rb); + ok(got == expected, "Got unexpected value 0x%08x at %u, expected 0x%08x.\n", got, i, expected); + + reset_command_list(command_list, context.allocator); + got = expected = 0; + get_buffer_readback_with_command_list(dst_buffers[1], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + for (y = 0; y < 32; ++y) + { + for (x = 0; x < 64; ++x) + { + got = get_readback_uint(&rb, 64 * y + x, 0, 0); + expected = 64 * (31 - y) + x; + + if (got != expected) + break; + } + if (got != expected) + break; + } + release_resource_readback(&rb); + ok(got == expected, "Got unexpected value 0x%08x at (%u, %u), expected 0x%08x.\n", got, x, y, expected); + + reset_command_list(command_list, context.allocator); + got = expected = 0; + get_buffer_readback_with_command_list(dst_buffers[2], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + for (y = 0; y < 32; ++y) + { + for (x = 0; x < 64; ++x) + { + got = get_readback_uint(&rb, 64 * y + x, 0, 0); + expected = 64 * y + 63 - x; + + if (got != expected) + break; + } + if (got != expected) + break; + } + release_resource_readback(&rb); + ok(got == expected, "Got unexpected value 0x%08x at (%u, %u), expected 0x%08x.\n", got, x, y, expected); + + reset_command_list(command_list, context.allocator); + got = expected = 0; + get_buffer_readback_with_command_list(dst_buffers[3], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + for (y = 0; y < 32; ++y) + { + for (x = 0; x < 64; ++x) + { + got = get_readback_uint(&rb, 64 * y + x, 0, 0); + expected = 64 * y + x % 32; + + if (got != expected) + break; + } + if (got != expected) + break; + } + release_resource_readback(&rb); + ok(got == expected, "Got unexpected value 0x%08x at (%u, %u), expected 0x%08x.\n", got, x, y, expected); + + ID3D12Resource_Release(src_texture); + for (i = 0; i < ARRAY_SIZE(dst_buffers); ++i) + ID3D12Resource_Release(dst_buffers[i]); + destroy_test_context(&context); +} + static void test_copy_buffer_texture(void) { D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; @@ -26123,6 +26294,7 @@ START_TEST(d3d12) run_test(test_instance_id); run_test(test_vertex_id); run_test(test_copy_texture); + run_test(test_copy_texture_buffer); run_test(test_copy_buffer_texture); run_test(test_separate_bindings); run_test(test_face_culling); -- 2.19.2

1 0

[PATCH vkd3d 07/11] vkd3d: Fix copying texture regions from textures to buffers.
by Józef Kucia March 14, 2019

March 14, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index fec7d59062af..4cd64b030249 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2526,6 +2526,37 @@ static void vk_buffer_image_copy_from_d3d12(VkBufferImageCopy *copy, } } +static void vk_image_buffer_copy_from_d3d12(VkBufferImageCopy *copy, + const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *footprint, unsigned int sub_resource_idx, + const D3D12_RESOURCE_DESC *image_desc, const struct vkd3d_format *format, + const D3D12_BOX *src_box, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) +{ + copy->bufferOffset = footprint->Offset; + copy->bufferOffset += (dst_x / format->block_width) * format->byte_count * format->block_byte_count; + copy->bufferOffset += dst_y * footprint->Footprint.RowPitch; + copy->bufferOffset += dst_z * footprint->Footprint.RowPitch * footprint->Footprint.Depth; + copy->bufferRowLength = footprint->Footprint.RowPitch / + (format->byte_count * format->block_byte_count) * format->block_width; + copy->bufferImageHeight = footprint->Footprint.Height; + vk_image_subresource_layers_from_d3d12(&copy->imageSubresource, + format, sub_resource_idx, image_desc->MipLevels); + copy->imageOffset.x = src_box ? src_box->left : 0; + copy->imageOffset.y = src_box ? src_box->top : 0; + copy->imageOffset.z = src_box ? src_box->front : 0; + if (src_box) + { + copy->imageExtent.width = src_box->right - src_box->left; + copy->imageExtent.height = src_box->bottom - src_box->top; + copy->imageExtent.depth = src_box->back - src_box->front; + } + else + { + copy->imageExtent.width = footprint->Footprint.Width; + copy->imageExtent.height = footprint->Footprint.Height; + copy->imageExtent.depth = footprint->Footprint.Depth; + } +} + static void vk_image_copy_from_d3d12(VkImageCopy *image_copy, unsigned int src_sub_resource_idx, unsigned int dst_sub_resource_idx, const D3D12_RESOURCE_DESC *src_desc, const D3D12_RESOURCE_DESC *dst_desc, @@ -2723,7 +2754,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic && (dst_format->vk_aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT)) FIXME("Depth-stencil format %#x not fully supported yet.\n", dst_format->dxgi_format); - vk_buffer_image_copy_from_d3d12(&buffer_image_copy, &dst->u.PlacedFootprint, + vk_image_buffer_copy_from_d3d12(&buffer_image_copy, &dst->u.PlacedFootprint, src->u.SubresourceIndex, &src_resource->desc, dst_format, src_box, dst_x, dst_y, dst_z); VK_CALL(vkCmdCopyImageToBuffer(list->vk_command_buffer, src_resource->u.vk_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, -- 2.19.2

1 0

[PATCH vkd3d 06/11] tests: Add more tests for copying data from buffers to textures.
by Józef Kucia March 14, 2019

March 14, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 179 ++++++++++++++++++++++++++++++++++++++- tests/d3d12_test_utils.h | 36 ++++++-- 2 files changed, 205 insertions(+), 10 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 654770ac5540..182213610d69 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20654,7 +20654,7 @@ static void test_vertex_id(void) destroy_test_context(&context); } -static void test_copy_texture_region(void) +static void test_copy_texture(void) { D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; ID3D12Resource *src_texture, *dst_texture; @@ -20844,6 +20844,180 @@ static void test_copy_texture_region(void) destroy_test_context(&context); } +static void test_copy_buffer_texture(void) +{ + D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; + ID3D12GraphicsCommandList *command_list; + struct test_context_desc desc; + struct test_context context; + struct resource_readback rb; + ID3D12Resource *zero_buffer; + ID3D12Resource *dst_texture; + ID3D12Resource *src_buffer; + unsigned int got, expected; + ID3D12CommandQueue *queue; + unsigned int buffer_size; + ID3D12Device *device; + unsigned int x, y, z; + unsigned int *ptr; + unsigned int i; + D3D12_BOX box; + HRESULT hr; + + memset(&desc, 0, sizeof(desc)); + desc.no_render_target = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + buffer_size = 128 * 128 * 128; + + zero_buffer = create_upload_buffer(device, buffer_size * sizeof(*ptr) + D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT, NULL); + hr = ID3D12Resource_Map(zero_buffer, 0, NULL, (void **)&ptr); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + memset(ptr, 0, buffer_size * sizeof(*ptr) + D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT); + for (i = 0; i < D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT / sizeof(*ptr); ++i) + ptr[i] = 0xdeadbeef; + ID3D12Resource_Unmap(zero_buffer, 0, NULL); + + src_buffer = create_upload_buffer(device, buffer_size * sizeof(*ptr), NULL); + hr = ID3D12Resource_Map(src_buffer, 0, NULL, (void **)&ptr); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + for (z = 0; z < 128; ++z) + { + for (y = 0; y < 128; ++y) + { + for (x = 0; x < 128; ++x) + { + ptr[z * 128 * 128 + y * 128 + x] = (z + 1) << 16 | (y + 1) << 8 | (x + 1); + } + } + } + ID3D12Resource_Unmap(src_buffer, 0, NULL); + + dst_texture = create_default_texture3d(device, 128, 128, 128, 2, + DXGI_FORMAT_R32_UINT, 0, D3D12_RESOURCE_STATE_COPY_DEST); + + dst_location.pResource = dst_texture; + dst_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; + dst_location.SubresourceIndex = 0; + + src_location.pResource = zero_buffer; + src_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT; + src_location.PlacedFootprint.Offset = D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT; + src_location.PlacedFootprint.Footprint.Format = DXGI_FORMAT_R32_UINT; + src_location.PlacedFootprint.Footprint.Width = 128; + src_location.PlacedFootprint.Footprint.Height = 128; + src_location.PlacedFootprint.Footprint.Depth = 128; + src_location.PlacedFootprint.Footprint.RowPitch = 128 * sizeof(*ptr); + + /* fill with 0 */ + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 0, 0, &src_location, NULL); + + src_location.pResource = src_buffer; + src_location.PlacedFootprint.Offset = 0; + + /* copy region 1 */ + set_box(&box, 64, 16, 8, 128, 128, 128); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 64, 16, 8, &src_location, &box); + + /* empty boxes */ + for (z = 0; z < 2; ++z) + { + for (y = 0; y < 4; ++y) + { + for (x = 0; x < 8; ++x) + { + set_box(&box, x, y, z, x, y, z); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 0, 0, &src_location, &box); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, x, y, z, &src_location, &box); + } + } + } + + /* copy region 2 */ + set_box(&box, 0, 0, 0, 4, 4, 4); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 2, 2, 2, &src_location, &box); + + /* fill sub-resource 1 */ + dst_location.SubresourceIndex = 1; + set_box(&box, 0, 0, 0, 64, 64, 64); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 0, 0, &src_location, &box); + + transition_resource_state(command_list, dst_texture, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + got = expected = 0; + get_texture_readback_with_command_list(dst_texture, 0, &rb, queue, command_list); + for (z = 0; z < 128; ++z) + { + for (y = 0; y < 128; ++y) + { + for (x = 0; x < 128; ++x) + { + got = get_readback_uint(&rb, x, y, z); + + if (2 <= x && x < 6 && 2 <= y && y < 6 && 2 <= z && z < 6) + expected = (z - 1) << 16 | (y - 1) << 8 | (x - 1); /* copy region 1 */ + else if (64 <= x && 16 <= y && 8 <= z) + expected = (z + 1) << 16 | (y + 1) << 8 | (x + 1); /* copy region 2 */ + else + expected = 0; + + if (got != expected) + break; + } + if (got != expected) + break; + } + if (got != expected) + break; + } + release_resource_readback(&rb); + ok(got == expected, + "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n", + got, x, y, z, expected); + + reset_command_list(command_list, context.allocator); + got = expected = 0; + get_texture_readback_with_command_list(dst_texture, 1, &rb, queue, command_list); + for (z = 0; z < 64; ++z) + { + for (y = 0; y < 64; ++y) + { + for (x = 0; x < 64; ++x) + { + got = get_readback_uint(&rb, x, y, z); + expected = (z + 1) << 16 | (y + 1) << 8 | (x + 1); + + if (got != expected) + break; + } + if (got != expected) + break; + } + if (got != expected) + break; + } + release_resource_readback(&rb); + ok(got == expected, + "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n", + got, x, y, z, expected); + + ID3D12Resource_Release(dst_texture); + ID3D12Resource_Release(src_buffer); + ID3D12Resource_Release(zero_buffer); + destroy_test_context(&context); +} + static void test_separate_bindings(void) { ID3D12Resource *cs_raw_buffer, *cs_raw_uav_buffer; @@ -25948,7 +26122,8 @@ START_TEST(d3d12) run_test(test_dispatch_zero_thread_groups); run_test(test_instance_id); run_test(test_vertex_id); - run_test(test_copy_texture_region); + run_test(test_copy_texture); + run_test(test_copy_buffer_texture); run_test(test_separate_bindings); run_test(test_face_culling); run_test(test_multithread_command_queue_exec); diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 53fa0e763ea3..0ea5a75544b3 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -301,7 +301,7 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi rb->width = max(1, resource_desc.Width >> miplevel); rb->height = max(1, resource_desc.Height >> miplevel); rb->depth = resource_desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D - ? resource_desc.DepthOrArraySize : 1; + ? max(1, resource_desc.DepthOrArraySize >> miplevel) : 1; rb->row_pitch = align(rb->width * format_size(resource_desc.Format), D3D12_TEXTURE_DATA_PITCH_ALIGNMENT); rb->data = NULL; @@ -429,25 +429,26 @@ static inline void check_sub_resource_uint_(unsigned int line, ID3D12Resource *t release_resource_readback(&rb); } -#define create_default_texture(a, b, c, d, e, f) create_default_texture2d_(__LINE__, a, b, c, 1, 1, d, e, f) -#define create_default_texture2d(a, b, c, d, e, f, g, h) create_default_texture2d_(__LINE__, a, b, c, d, e, f, g, h) -static ID3D12Resource *create_default_texture2d_(unsigned int line, ID3D12Device *device, - unsigned int width, unsigned int height, unsigned int array_size, unsigned int miplevel_count, - DXGI_FORMAT format, D3D12_RESOURCE_FLAGS flags, D3D12_RESOURCE_STATES initial_state) +static ID3D12Resource *create_default_texture_(unsigned int line, ID3D12Device *device, + D3D12_RESOURCE_DIMENSION dimension, unsigned int width, unsigned int height, + unsigned int depth_or_array_size, unsigned int miplevel_count, DXGI_FORMAT format, + D3D12_RESOURCE_FLAGS flags, D3D12_RESOURCE_STATES initial_state) { D3D12_HEAP_PROPERTIES heap_properties; D3D12_RESOURCE_DESC resource_desc; ID3D12Resource *texture; HRESULT hr; + assert(dimension != D3D12_RESOURCE_DIMENSION_BUFFER); + memset(&heap_properties, 0, sizeof(heap_properties)); heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; memset(&resource_desc, 0, sizeof(resource_desc)); - resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Dimension = dimension; resource_desc.Width = width; resource_desc.Height = height; - resource_desc.DepthOrArraySize = array_size; + resource_desc.DepthOrArraySize = depth_or_array_size; resource_desc.MipLevels = miplevel_count; resource_desc.Format = format; resource_desc.SampleDesc.Count = 1; @@ -459,6 +460,25 @@ static ID3D12Resource *create_default_texture2d_(unsigned int line, ID3D12Device return texture; } +#define create_default_texture(a, b, c, d, e, f) create_default_texture2d_(__LINE__, a, b, c, 1, 1, d, e, f) +#define create_default_texture2d(a, b, c, d, e, f, g, h) create_default_texture2d_(__LINE__, a, b, c, d, e, f, g, h) +static ID3D12Resource *create_default_texture2d_(unsigned int line, ID3D12Device *device, + unsigned int width, unsigned int height, unsigned int array_size, unsigned int miplevel_count, + DXGI_FORMAT format, D3D12_RESOURCE_FLAGS flags, D3D12_RESOURCE_STATES initial_state) +{ + return create_default_texture_(line, device, D3D12_RESOURCE_DIMENSION_TEXTURE2D, + width, height, array_size, miplevel_count, format, flags, initial_state); +} + +#define create_default_texture3d(a, b, c, d, e, f, g, h) create_default_texture3d_(__LINE__, a, b, c, d, e, f, g, h) +static inline ID3D12Resource *create_default_texture3d_(unsigned int line, ID3D12Device *device, + unsigned int width, unsigned int height, unsigned int depth, unsigned int miplevel_count, + DXGI_FORMAT format, D3D12_RESOURCE_FLAGS flags, D3D12_RESOURCE_STATES initial_state) +{ + return create_default_texture_(line, device, D3D12_RESOURCE_DIMENSION_TEXTURE3D, + width, height, depth, miplevel_count, format, flags, initial_state); +} + static HRESULT create_root_signature(ID3D12Device *device, const D3D12_ROOT_SIGNATURE_DESC *desc, ID3D12RootSignature **root_signature) { -- 2.19.2

1 0

[PATCH] [PATCH v3] gdi32: add D3DKMTCloseAdapter stub
by Louis Lenders March 14, 2019

March 14, 2019

v3: fix some issues with the declaration of the parameter and add prototype to d3dkmthk.h >While you're at it, could you also do the same for >D3DKMTOpenAdapterFromHdc() and D3DKMTEscape()? If this one is ok, I`ll send updates for those later. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=46571 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/gdi32/driver.c | 13 +++++++++++++ dlls/gdi32/gdi32.spec | 1 + include/d3dukmdt.h | 2 ++ include/ddk/d3dkmthk.h | 6 ++++++ 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index 405afb986f..e8aa38edf4 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -6,7 +6,7 @@ @ stub D3DKMTCheckOcclusion @ stub D3DKMTCheckSharedResourceAccess @ stub D3DKMTCheckVidPnExclusiveOwnership -@ stub D3DKMTCloseAdapter +@ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTConfigureSharedResource @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateAllocation2 diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 8920b73f59..fd25f7d713 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -26,12 +26,16 @@ #include <stdarg.h> #include <string.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "ddrawgdi.h" #include "wine/winbase16.h" #include "winuser.h" #include "winternl.h" +#include "ddk/d3dkmthk.h" #include "gdi_private.h" #include "wine/unicode.h" @@ -1253,3 +1257,12 @@ NTSTATUS WINAPI D3DKMTEscape( const void *pData ) FIXME("(%p): stub\n", pData); return STATUS_NO_MEMORY; } + +/****************************************************************************** + * D3DKMTCloseAdapter [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *data ) +{ + FIXME("(%p): stub\n", data); + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 2dc8f0e887..6e8f0285f4 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -80,6 +80,7 @@ @ stdcall CreateScalableFontResourceA(long str str str) @ stdcall CreateScalableFontResourceW(long wstr wstr wstr) @ stdcall CreateSolidBrush(long) +@ stdcall D3DKMTCloseAdapter(ptr) @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) diff --git a/include/d3dukmdt.h b/include/d3dukmdt.h index a7be710ef1..ce2b0c2488 100644 --- a/include/d3dukmdt.h +++ b/include/d3dukmdt.h @@ -25,6 +25,8 @@ ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) #endif /* MAKEFOURCC */ +typedef UINT D3DKMT_HANDLE; + typedef enum _D3DDDIFORMAT { D3DDDIFMT_UNKNOWN = 0, diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 80c0c8a27e..bfa77da7d4 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -34,6 +34,11 @@ typedef struct _D3DKMT_CREATEDCFROMMEMORY HANDLE hBitmap; } D3DKMT_CREATEDCFROMMEMORY; +typedef struct _D3DKMT_CLOSEADAPTER +{ + D3DKMT_HANDLE hAdapter; +} D3DKMT_CLOSEADAPTER; + typedef struct _D3DKMT_DESTROYDCFROMMEMORY { HDC hDc; @@ -45,6 +50,7 @@ extern "C" { #endif /* __cplusplus */ +NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *data); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); -- 2.20.1

2 1

[PATCH v4] gdi32: Add D3DKMTCloseAdapter() stub.
by Huw Davies March 14, 2019

March 14, 2019

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=46571 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/gdi32/driver.c | 13 +++++++++++++ dlls/gdi32/gdi32.spec | 1 + include/d3dukmdt.h | 2 ++ include/ddk/d3dkmthk.h | 6 ++++++ 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index 405afb986f..e8aa38edf4 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -6,7 +6,7 @@ @ stub D3DKMTCheckOcclusion @ stub D3DKMTCheckSharedResourceAccess @ stub D3DKMTCheckVidPnExclusiveOwnership -@ stub D3DKMTCloseAdapter +@ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTConfigureSharedResource @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateAllocation2 diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 8920b73f59..054d7cf418 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -26,12 +26,16 @@ #include <stdarg.h> #include <string.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "ddrawgdi.h" #include "wine/winbase16.h" #include "winuser.h" #include "winternl.h" +#include "ddk/d3dkmthk.h" #include "gdi_private.h" #include "wine/unicode.h" @@ -1253,3 +1257,12 @@ NTSTATUS WINAPI D3DKMTEscape( const void *pData ) FIXME("(%p): stub\n", pData); return STATUS_NO_MEMORY; } + +/****************************************************************************** + * D3DKMTCloseAdapter [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) +{ + FIXME("(%p): stub\n", desc); + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 2dc8f0e887..6e8f0285f4 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -80,6 +80,7 @@ @ stdcall CreateScalableFontResourceA(long str str str) @ stdcall CreateScalableFontResourceW(long wstr wstr wstr) @ stdcall CreateSolidBrush(long) +@ stdcall D3DKMTCloseAdapter(ptr) @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) diff --git a/include/d3dukmdt.h b/include/d3dukmdt.h index a7be710ef1..ce2b0c2488 100644 --- a/include/d3dukmdt.h +++ b/include/d3dukmdt.h @@ -25,6 +25,8 @@ ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) #endif /* MAKEFOURCC */ +typedef UINT D3DKMT_HANDLE; + typedef enum _D3DDDIFORMAT { D3DDDIFMT_UNKNOWN = 0, diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 80c0c8a27e..0000b2f653 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -21,6 +21,11 @@ #include <d3dukmdt.h> +typedef struct _D3DKMT_CLOSEADAPTER +{ + D3DKMT_HANDLE hAdapter; +} D3DKMT_CLOSEADAPTER; + typedef struct _D3DKMT_CREATEDCFROMMEMORY { void *pMemory; @@ -45,6 +50,7 @@ extern "C" { #endif /* __cplusplus */ +NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); -- 2.18.0

1 0