wine-devel March 2019

wine-devel@winehq.org

76 participants
1010 discussions

[PATCH 2/13] msidb: Add support for importing database tables.
by Erich E. Hoover 18 Mar '19

18 Mar '19

msidb uses a nice CLI syntax for adding multiple database tables in one call with the "-i" mode flag, this patch implements that syntax. For example, this call would import three tables from the current directory (ActionTe.idt, Componen.idt, and InstallE.idt): msidb -d package.msi -f . -i ActionText Component InstallExecuteSequence

2 5

[PATCH] xaudio2_7: Add a trailing '\n' to an ERR() message.
by Francois Gouget 18 Mar '19

18 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/xaudio2_7/xapo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c index 3ccb3f190b0..9788cb38e86 100644 --- a/dlls/xaudio2_7/xapo.c +++ b/dlls/xaudio2_7/xapo.c @@ -337,7 +337,7 @@ static inline HRESULT get_fapo_from_clsid(REFCLSID clsid, FAPO **fapo) XAudio_Internal_Realloc ); #endif - ERR("Invalid XAPO CLSID!"); + ERR("Invalid XAPO CLSID!\n"); return E_INVALIDARG; } -- 2.20.1

3 2

[PATCH] xaudio2_7/tests: Remove redundant not-NULL checks (coccinellery)
by Michael Stefaniuc 18 Mar '19

18 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- return if pCreateFX is NULL. The diff looks very odd but a "git show -w" looks very clean. dlls/xaudio2_7/tests/xaudio2.c | 104 ++++++++++++++++----------------- 1 file changed, 50 insertions(+), 54 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 4ead8d8de4..f2bffdf29f 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -1000,28 +1000,9 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) return; } - if(pCreateFX){ - for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){ - hr = pCreateFX(const_clsids[i], &fx_unk); - ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr); - if(SUCCEEDED(hr)){ - IXAPO *xapo; - hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr); - if(SUCCEEDED(hr)) - IXAPO_Release(xapo); - IUnknown_Release(fx_unk); - } - - hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void**)&fx_unk); - ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr); - if(SUCCEEDED(hr)) - IUnknown_Release(fx_unk); - } - - hr = pCreateFX(avm_clsids[version - 20], &fx_unk); - ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(avm_clsids[version - 20]), hr); + for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){ + hr = pCreateFX(const_clsids[i], &fx_unk); + ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr); if(SUCCEEDED(hr)){ IXAPO *xapo; hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo); @@ -1031,16 +1012,33 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) IUnknown_Release(fx_unk); } - hr = pCreateFX(ar_clsids[version - 20], &fx_unk); - ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(ar_clsids[version - 20]), hr); - if(SUCCEEDED(hr)){ - IXAPO *xapo; - hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr); - if(SUCCEEDED(hr)) - IXAPO_Release(xapo); + hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&fx_unk); + ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(fx_unk); - } + } + + hr = pCreateFX(avm_clsids[version - 20], &fx_unk); + ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(avm_clsids[version - 20]), hr); + if(SUCCEEDED(hr)){ + IXAPO *xapo; + hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo); + ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr); + if(SUCCEEDED(hr)) + IXAPO_Release(xapo); + IUnknown_Release(fx_unk); + } + + hr = pCreateFX(ar_clsids[version - 20], &fx_unk); + ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(ar_clsids[version - 20]), hr); + if(SUCCEEDED(hr)){ + IXAPO *xapo; + hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo); + ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr); + if(SUCCEEDED(hr)) + IXAPO_Release(xapo); + IUnknown_Release(fx_unk); } FreeLibrary(xapofxdll); @@ -1083,29 +1081,9 @@ static void test_xapo_creation_modern(const char *module) return; } - if(pCreateFX){ - for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){ - hr = pCreateFX(const_clsids[i], &fx_unk, NULL, 0); - ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr); - if(SUCCEEDED(hr)){ - IXAPO *xapo; - hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); - if(SUCCEEDED(hr)) - IXAPO_Release(xapo); - IUnknown_Release(fx_unk); - } - - hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void**)&fx_unk); - ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr); - if(SUCCEEDED(hr)) - IUnknown_Release(fx_unk); - } - - /* test legacy CLSID */ - hr = pCreateFX(&CLSID_AudioVolumeMeter27, &fx_unk, NULL, 0); - ok(hr == S_OK, "%s: CreateFX(CLSID_AudioVolumeMeter) failed: %08x\n", module, hr); + for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){ + hr = pCreateFX(const_clsids[i], &fx_unk, NULL, 0); + ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr); if(SUCCEEDED(hr)){ IXAPO *xapo; hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo); @@ -1114,6 +1092,24 @@ static void test_xapo_creation_modern(const char *module) IXAPO_Release(xapo); IUnknown_Release(fx_unk); } + + hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&fx_unk); + ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr); + if(SUCCEEDED(hr)) + IUnknown_Release(fx_unk); + } + + /* test legacy CLSID */ + hr = pCreateFX(&CLSID_AudioVolumeMeter27, &fx_unk, NULL, 0); + ok(hr == S_OK, "%s: CreateFX(CLSID_AudioVolumeMeter) failed: %08x\n", module, hr); + if(SUCCEEDED(hr)){ + IXAPO *xapo; + hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo); + ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); + if(SUCCEEDED(hr)) + IXAPO_Release(xapo); + IUnknown_Release(fx_unk); } pCAVM = (void*)GetProcAddress(xaudio2dll, "CreateAudioVolumeMeter"); -- 2.20.1

3 2

[PATCH] d3d12/tests: A spelling fix in a skip() message.
by Francois Gouget 18 Mar '19

18 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/d3d12/tests/d3d12.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 76efb561c4f..ae750af40ae 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -914,7 +914,7 @@ static void test_create_device(void) } else { - skip("GetContaingOutput() is not supported.\n"); + skip("GetContainingOutput() is not supported.\n"); } refcount = IDXGISwapChain3_Release(swapchain); -- 2.20.1

3 2

[PATCH vkd3d 8/8] tests: Add test for copying misaligned texture regions.
by Józef Kucia 18 Mar '19

18 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 56 ------------- tests/d3d12_invalid_usage.c | 151 +++++++++++++++++++++++++++++++++--- tests/d3d12_test_utils.h | 56 +++++++++++++ 3 files changed, 195 insertions(+), 68 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 89cc4dd70410..89858ae01f02 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -173,14 +173,6 @@ static void uav_barrier(ID3D12GraphicsCommandList *list, ID3D12Resource *resourc ID3D12GraphicsCommandList_ResourceBarrier(list, 1, &barrier); } -#define create_default_buffer(a, b, c, d) create_default_buffer_(__LINE__, a, b, c, d) -static ID3D12Resource *create_default_buffer_(unsigned int line, ID3D12Device *device, - size_t size, D3D12_RESOURCE_FLAGS resource_flags, D3D12_RESOURCE_STATES initial_resource_state) -{ - return create_buffer_(line, device, D3D12_HEAP_TYPE_DEFAULT, size, - resource_flags, initial_resource_state); -} - static void copy_sub_resource_data(const D3D12_MEMCPY_DEST *dst, const D3D12_SUBRESOURCE_DATA *src, unsigned int row_count, unsigned int slice_count, size_t row_size) { @@ -295,54 +287,6 @@ static void upload_texture_data_(unsigned int line, ID3D12Resource *texture, free(row_sizes); } -static unsigned int format_block_width(DXGI_FORMAT format) -{ - switch (format) - { - case DXGI_FORMAT_BC1_UNORM: - case DXGI_FORMAT_BC1_UNORM_SRGB: - case DXGI_FORMAT_BC4_UNORM: - case DXGI_FORMAT_BC4_SNORM: - case DXGI_FORMAT_BC2_UNORM: - case DXGI_FORMAT_BC2_UNORM_SRGB: - case DXGI_FORMAT_BC3_UNORM: - case DXGI_FORMAT_BC3_UNORM_SRGB: - case DXGI_FORMAT_BC5_UNORM: - case DXGI_FORMAT_BC5_SNORM: - case DXGI_FORMAT_BC6H_UF16: - case DXGI_FORMAT_BC6H_SF16: - case DXGI_FORMAT_BC7_UNORM: - case DXGI_FORMAT_BC7_UNORM_SRGB: - return 4; - default: - return 1; - } -} - -static unsigned int format_block_height(DXGI_FORMAT format) -{ - switch (format) - { - case DXGI_FORMAT_BC1_UNORM: - case DXGI_FORMAT_BC1_UNORM_SRGB: - case DXGI_FORMAT_BC4_UNORM: - case DXGI_FORMAT_BC4_SNORM: - case DXGI_FORMAT_BC2_UNORM: - case DXGI_FORMAT_BC2_UNORM_SRGB: - case DXGI_FORMAT_BC3_UNORM: - case DXGI_FORMAT_BC3_UNORM_SRGB: - case DXGI_FORMAT_BC5_UNORM: - case DXGI_FORMAT_BC5_SNORM: - case DXGI_FORMAT_BC6H_UF16: - case DXGI_FORMAT_BC6H_SF16: - case DXGI_FORMAT_BC7_UNORM: - case DXGI_FORMAT_BC7_UNORM_SRGB: - return 4; - default: - return 1; - } -} - static const DXGI_FORMAT depth_stencil_formats[] = { DXGI_FORMAT_R32G8X24_TYPELESS, diff --git a/tests/d3d12_invalid_usage.c b/tests/d3d12_invalid_usage.c index 940dea91d4ec..a76873bd20e6 100644 --- a/tests/d3d12_invalid_usage.c +++ b/tests/d3d12_invalid_usage.c @@ -41,15 +41,15 @@ static void test_invalid_texture_resource_barriers(void) command_queue_desc.NodeMask = 0; hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc, &IID_ID3D12CommandQueue, (void **)&queue); - ok(SUCCEEDED(hr), "Failed to create command queue, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT, &IID_ID3D12CommandAllocator, (void **)&command_allocator); - ok(SUCCEEDED(hr), "Failed to create command allocator, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create command allocator, hr %#x.\n", hr); hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list); - ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); texture = create_default_texture(device, 32, 32, DXGI_FORMAT_R8G8B8A8_UNORM, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE); @@ -60,7 +60,7 @@ static void test_invalid_texture_resource_barriers(void) transition_resource_state(command_list, texture, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); hr = ID3D12GraphicsCommandList_Close(command_list); - ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); reset_command_list(command_list, command_allocator); @@ -80,10 +80,10 @@ static void test_invalid_texture_resource_barriers(void) ID3D12GraphicsCommandList_Release(command_list); hr = ID3D12CommandAllocator_Reset(command_allocator); - ok(SUCCEEDED(hr), "Failed to reset command allocator, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to reset command allocator, hr %#x.\n", hr); hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list); - ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); /* The before state does not match with the previous state. */ transition_resource_state(command_list, texture, @@ -101,11 +101,11 @@ static void test_invalid_texture_resource_barriers(void) } hr = ID3D12CommandAllocator_Reset(command_allocator); - ok(SUCCEEDED(hr), "Failed to reset command allocator, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to reset command allocator, hr %#x.\n", hr); ID3D12GraphicsCommandList_Release(command_list); hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list); - ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); /* Exactly one write state or a combination of read-only states are allowed. */ transition_resource_state(command_list, texture, @@ -115,11 +115,11 @@ static void test_invalid_texture_resource_barriers(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D12CommandAllocator_Reset(command_allocator); - ok(SUCCEEDED(hr), "Failed to reset command allocator, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to reset command allocator, hr %#x.\n", hr); ID3D12GraphicsCommandList_Release(command_list); hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list); - ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); /* Readback resources cannot transition from D3D12_RESOURCE_STATE_COPY_DEST. */ transition_resource_state(command_list, readback_buffer, @@ -128,11 +128,11 @@ static void test_invalid_texture_resource_barriers(void) todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D12CommandAllocator_Reset(command_allocator); - ok(SUCCEEDED(hr), "Failed to reset command allocator, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to reset command allocator, hr %#x.\n", hr); ID3D12GraphicsCommandList_Release(command_list); hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list); - ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); /* Upload resources cannot transition from D3D12_RESOURCE_STATE_GENERIC_READ. */ transition_resource_state(command_list, upload_buffer, @@ -150,6 +150,132 @@ static void test_invalid_texture_resource_barriers(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_invalid_copy_texture_region(void) +{ + ID3D12Resource *dst_texture, *src_texture, *dst_buffer, *src_buffer; + D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; + ID3D12CommandAllocator *command_allocator; + ID3D12GraphicsCommandList *command_list; + ID3D12Device *device; + ULONG refcount; + D3D12_BOX box; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT, + &IID_ID3D12CommandAllocator, (void **)&command_allocator); + ok(hr == S_OK, "Failed to create command allocator, hr %#x.\n", hr); + + hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, + command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + src_buffer = create_upload_buffer(device, 0x40000, NULL); + dst_buffer = create_default_buffer(device, 0x40000, 0, D3D12_RESOURCE_STATE_COPY_DEST); + + src_texture = create_default_texture(device, 64, 64, + DXGI_FORMAT_BC3_UNORM, 0, D3D12_RESOURCE_STATE_COPY_SOURCE); + dst_texture = create_default_texture(device, 64, 64, + DXGI_FORMAT_BC3_UNORM, 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 = src_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_BC3_UNORM; + src_location.PlacedFootprint.Footprint.Width = 64; + src_location.PlacedFootprint.Footprint.Height = 63; /* height must be multiple of block size */ + src_location.PlacedFootprint.Footprint.Depth = 1; + src_location.PlacedFootprint.Footprint.RowPitch + = 64 / format_block_width(DXGI_FORMAT_BC3_UNORM) * format_size(DXGI_FORMAT_BC3_UNORM); + + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 0, 0, &src_location, NULL); + + hr = ID3D12GraphicsCommandList_Close(command_list); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12CommandAllocator_Reset(command_allocator); + ok(hr == S_OK, "Failed to reset command allocator, hr %#x.\n", hr); + ID3D12GraphicsCommandList_Release(command_list); + hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, + command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + src_location.PlacedFootprint.Footprint.Width = 4; + src_location.PlacedFootprint.Footprint.Height = 4; + + /* dst y must be multiple of block size */ + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 3, 0, &src_location, NULL); + + hr = ID3D12GraphicsCommandList_Close(command_list); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12CommandAllocator_Reset(command_allocator); + ok(hr == S_OK, "Failed to reset command allocator, hr %#x.\n", hr); + ID3D12GraphicsCommandList_Release(command_list); + hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, + command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + /* row pitch must be multiple of D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT */ + src_location.PlacedFootprint.Footprint.RowPitch + = 64 / format_block_width(DXGI_FORMAT_BC3_UNORM) * format_size(DXGI_FORMAT_BC3_UNORM) + 1; + + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 0, 0, &src_location, NULL); + + hr = ID3D12GraphicsCommandList_Close(command_list); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12CommandAllocator_Reset(command_allocator); + ok(hr == S_OK, "Failed to reset command allocator, hr %#x.\n", hr); + ID3D12GraphicsCommandList_Release(command_list); + hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, + command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + dst_location.pResource = dst_buffer; + dst_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT; + dst_location.PlacedFootprint.Offset = D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT; + dst_location.PlacedFootprint.Footprint.Format = DXGI_FORMAT_BC3_UNORM; + dst_location.PlacedFootprint.Footprint.Width = 64; + dst_location.PlacedFootprint.Footprint.Height = 64; + dst_location.PlacedFootprint.Footprint.Depth = 1; + dst_location.PlacedFootprint.Footprint.RowPitch + = 64 / format_block_width(DXGI_FORMAT_BC3_UNORM) * format_size(DXGI_FORMAT_BC3_UNORM); + + src_location.pResource = src_texture; + src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; + src_location.SubresourceIndex = 0; + + /* coordinates must be multiple of block size */ + set_box(&box, 0, 0, 0, 31, 31, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 0, 0, &src_location, &box); + + hr = ID3D12GraphicsCommandList_Close(command_list); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + ID3D12CommandAllocator_Release(command_allocator); + ID3D12GraphicsCommandList_Release(command_list); + ID3D12Resource_Release(dst_buffer); + ID3D12Resource_Release(src_buffer); + ID3D12Resource_Release(dst_texture); + ID3D12Resource_Release(src_texture); + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + START_TEST(d3d12_invalid_usage) { parse_args(argc, argv); @@ -157,4 +283,5 @@ START_TEST(d3d12_invalid_usage) init_adapter_info(); run_test(test_invalid_texture_resource_barriers); + run_test(test_invalid_copy_texture_region); } diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index a771c1662e4e..14c6d04e3ada 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -268,6 +268,54 @@ static unsigned int format_size(DXGI_FORMAT format) } } +static inline unsigned int format_block_width(DXGI_FORMAT format) +{ + switch (format) + { + case DXGI_FORMAT_BC1_UNORM: + case DXGI_FORMAT_BC1_UNORM_SRGB: + case DXGI_FORMAT_BC4_UNORM: + case DXGI_FORMAT_BC4_SNORM: + case DXGI_FORMAT_BC2_UNORM: + case DXGI_FORMAT_BC2_UNORM_SRGB: + case DXGI_FORMAT_BC3_UNORM: + case DXGI_FORMAT_BC3_UNORM_SRGB: + case DXGI_FORMAT_BC5_UNORM: + case DXGI_FORMAT_BC5_SNORM: + case DXGI_FORMAT_BC6H_UF16: + case DXGI_FORMAT_BC6H_SF16: + case DXGI_FORMAT_BC7_UNORM: + case DXGI_FORMAT_BC7_UNORM_SRGB: + return 4; + default: + return 1; + } +} + +static inline unsigned int format_block_height(DXGI_FORMAT format) +{ + switch (format) + { + case DXGI_FORMAT_BC1_UNORM: + case DXGI_FORMAT_BC1_UNORM_SRGB: + case DXGI_FORMAT_BC4_UNORM: + case DXGI_FORMAT_BC4_SNORM: + case DXGI_FORMAT_BC2_UNORM: + case DXGI_FORMAT_BC2_UNORM_SRGB: + case DXGI_FORMAT_BC3_UNORM: + case DXGI_FORMAT_BC3_UNORM_SRGB: + case DXGI_FORMAT_BC5_UNORM: + case DXGI_FORMAT_BC5_SNORM: + case DXGI_FORMAT_BC6H_UF16: + case DXGI_FORMAT_BC6H_SF16: + case DXGI_FORMAT_BC7_UNORM: + case DXGI_FORMAT_BC7_UNORM_SRGB: + return 4; + default: + return 1; + } +} + struct resource_readback { unsigned int width; @@ -431,6 +479,14 @@ static inline void check_sub_resource_uint_(unsigned int line, ID3D12Resource *t release_resource_readback(&rb); } +#define create_default_buffer(a, b, c, d) create_default_buffer_(__LINE__, a, b, c, d) +static inline ID3D12Resource *create_default_buffer_(unsigned int line, ID3D12Device *device, + size_t size, D3D12_RESOURCE_FLAGS resource_flags, D3D12_RESOURCE_STATES initial_resource_state) +{ + return create_buffer_(line, device, D3D12_HEAP_TYPE_DEFAULT, size, + resource_flags, initial_resource_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, -- 2.19.2

2 1

[PATCH vkd3d 7/8] tests: Map readback buffers with correct read range.
by Józef Kucia 18 Mar '19

18 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12_test_utils.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 319d52ffe7ec..a771c1662e4e 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -288,6 +288,7 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi D3D12_RANGE read_range; unsigned int miplevel; ID3D12Device *device; + uint64_t buffer_size; HRESULT hr; hr = ID3D12Resource_GetDevice(texture, &IID_ID3D12Device, (void **)&device); @@ -331,7 +332,8 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi src_resource = texture; } - rb->resource = create_readback_buffer(device, rb->row_pitch * rb->height * rb->depth); + buffer_size = rb->row_pitch * rb->height * rb->depth; + rb->resource = create_readback_buffer(device, buffer_size); dst_location.pResource = rb->resource; dst_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT; @@ -358,7 +360,7 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi ID3D12Resource_Release(src_resource); read_range.Begin = 0; - read_range.End = resource_desc.Width; + read_range.End = buffer_size; hr = ID3D12Resource_Map(rb->resource, 0, &read_range, &rb->data); assert_that(hr == S_OK, "Failed to map readback buffer, hr %#x.\n", hr); } -- 2.19.2

2 1

[PATCH vkd3d 6/8] tests: Add test for copying texture regions from and to BC textures.
by Józef Kucia 18 Mar '19

18 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 175 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index d21be3ff5cd1..89cc4dd70410 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21194,6 +21194,180 @@ static void test_copy_buffer_texture(void) destroy_test_context(&context); } +static void test_copy_block_compressed_texture(void) +{ + D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; + ID3D12Resource *dst_buffer, *src_buffer; + ID3D12GraphicsCommandList *command_list; + struct test_context_desc desc; + unsigned int x, y, block_id; + struct test_context context; + struct resource_readback rb; + struct uvec4 got, expected; + ID3D12CommandQueue *queue; + ID3D12Resource *texture; + ID3D12Device *device; + unsigned int *ptr; + 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; + + dst_buffer = create_default_buffer(device, 4096, 0, D3D12_RESOURCE_STATE_COPY_DEST); + src_buffer = create_upload_buffer(device, 4096, NULL); + hr = ID3D12Resource_Map(src_buffer, 0, NULL, (void **)&ptr); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + for (x = 0; x < 4096 / format_size(DXGI_FORMAT_BC2_UNORM); ++x) + { + block_id = x << 8; + *ptr++ = block_id | 0; + *ptr++ = block_id | 1; + *ptr++ = block_id | 2; + *ptr++ = block_id | 3; + } + ID3D12Resource_Unmap(src_buffer, 0, NULL); + + texture = create_default_texture(device, + 8, 8, DXGI_FORMAT_BC2_UNORM, 0, D3D12_RESOURCE_STATE_COPY_DEST); + + /* copy from buffer to texture */ + dst_location.pResource = texture; + dst_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; + dst_location.SubresourceIndex = 0; + + src_location.pResource = src_buffer; + src_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT; + src_location.PlacedFootprint.Offset = 0; + src_location.PlacedFootprint.Footprint.Format = DXGI_FORMAT_BC2_UNORM; + src_location.PlacedFootprint.Footprint.Width = 32; + src_location.PlacedFootprint.Footprint.Height = 32; + src_location.PlacedFootprint.Footprint.Depth = 1; + src_location.PlacedFootprint.Footprint.RowPitch + = 32 / format_block_width(DXGI_FORMAT_BC2_UNORM) * format_size(DXGI_FORMAT_BC2_UNORM); + src_location.PlacedFootprint.Footprint.RowPitch + = align(src_location.PlacedFootprint.Footprint.RowPitch, D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT); + + set_box(&box, 4, 4, 0, 8, 8, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 0, 0, &src_location, &box); + set_box(&box, 28, 0, 0, 32, 4, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 4, 0, 0, &src_location, &box); + set_box(&box, 0, 24, 0, 4, 28, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 4, 0, &src_location, &box); + set_box(&box, 16, 16, 0, 20, 20, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 4, 4, 0, &src_location, &box); + + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + /* copy from texture to buffer */ + dst_location.pResource = dst_buffer; + dst_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT; + dst_location.PlacedFootprint.Offset = 0; + dst_location.PlacedFootprint.Footprint.Format = DXGI_FORMAT_BC2_UNORM; + dst_location.PlacedFootprint.Footprint.Width = 8; + dst_location.PlacedFootprint.Footprint.Height = 24; + dst_location.PlacedFootprint.Footprint.Depth = 1; + dst_location.PlacedFootprint.Footprint.RowPitch + = 8 / format_block_width(DXGI_FORMAT_BC2_UNORM) * format_size(DXGI_FORMAT_BC2_UNORM); + dst_location.PlacedFootprint.Footprint.RowPitch + = align(dst_location.PlacedFootprint.Footprint.RowPitch, D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT); + + src_location.pResource = 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); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 8, 0, &src_location, NULL); + set_box(&box, 0, 0, 0, 8, 8, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, + &dst_location, 0, 16, 0, &src_location, &box); + + transition_resource_state(command_list, dst_buffer, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_texture_readback_with_command_list(texture, 0, &rb, queue, command_list); + for (y = 0; y < 8 / format_block_height(DXGI_FORMAT_BC2_UNORM); ++y) + { + for (x = 0; x < 8 / format_block_width(DXGI_FORMAT_BC2_UNORM); ++x) + { + if (x == 0 && y == 0) + block_id = 33; + else if (x == 1 && y == 0) + block_id = 7; + else if (x == 0 && y == 1) + block_id = 192; + else + block_id = 132; + + expected.x = block_id << 8 | 0; + expected.y = block_id << 8 | 1; + expected.z = block_id << 8 | 2; + expected.w = block_id << 8 | 3; + got = *get_readback_uvec4(&rb, x, y); + + if (!compare_uvec4(&got, &expected)) + break; + } + if (!compare_uvec4(&got, &expected)) + break; + } + release_resource_readback(&rb); + ok(compare_uvec4(&got, &expected), + "Got {0x%08x, 0x%08x, 0x%08x, 0x%08x} at (%u, %u), expected {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n", + got.x, got.y, got.z, got.w, x, y, expected.x, expected.y, expected.z, expected.w); + + reset_command_list(command_list, context.allocator); + get_buffer_readback_with_command_list(dst_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + for (y = 0; y < 24 / format_block_height(DXGI_FORMAT_BC2_UNORM); ++y) + { + unsigned int row_offset = dst_location.PlacedFootprint.Footprint.RowPitch / sizeof(got) * y; + + for (x = 0; x < 4 / format_block_width(DXGI_FORMAT_BC2_UNORM); ++x) + { + if (x == 0 && y % 2 == 0) + block_id = 33; + else if (x == 1 && y % 2 == 0) + block_id = 7; + else if (x == 0 && y % 2 == 1) + block_id = 192; + else + block_id = 132; + + expected.x = block_id << 8 | 0; + expected.y = block_id << 8 | 1; + expected.z = block_id << 8 | 2; + expected.w = block_id << 8 | 3; + got = *get_readback_uvec4(&rb, x + row_offset, 0); + + if (!compare_uvec4(&got, &expected)) + break; + } + if (!compare_uvec4(&got, &expected)) + break; + } + release_resource_readback(&rb); + ok(compare_uvec4(&got, &expected), + "Got {0x%08x, 0x%08x, 0x%08x, 0x%08x} at (%u, %u), expected {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n", + got.x, got.y, got.z, got.w, x, y, expected.x, expected.y, expected.z, expected.w); + + ID3D12Resource_Release(texture); + ID3D12Resource_Release(src_buffer); + ID3D12Resource_Release(dst_buffer); + destroy_test_context(&context); +} + static void test_separate_bindings(void) { ID3D12Resource *cs_raw_buffer, *cs_raw_uav_buffer; @@ -26301,6 +26475,7 @@ START_TEST(d3d12) run_test(test_copy_texture); run_test(test_copy_texture_buffer); run_test(test_copy_buffer_texture); + run_test(test_copy_block_compressed_texture); run_test(test_separate_bindings); run_test(test_face_culling); run_test(test_multithread_command_queue_exec); -- 2.19.2

2 1

[PATCH vkd3d 5/8] vkd3d: Validate box in d3d12_command_list_CopyTextureRegion().
by Józef Kucia 18 Mar '19

18 Mar '19

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 0ce540a7d8a7..33dfcaf1ad41 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2715,6 +2715,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) @@ -2729,6 +2736,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 0abb62fd7fbc..e0af3f6e2dfd 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -321,6 +321,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 825a64787714..d21be3ff5cd1 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

2 1

[PATCH vkd3d 4/8] tests: Add more tests for copying data from textures to buffers.
by Józef Kucia 18 Mar '19

18 Mar '19

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 9c5a5bb9a159..825a64787714 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

2 1

[PATCH vkd3d 2/8] tests: Add more tests for copying data from buffers to textures.
by Józef Kucia 18 Mar '19

18 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 3: * Change 3D texture size from 128x128x128 to 128x100x64. * Fix slice_pitch in get_readback_data(). get_readback_data() is still not usable with block compressed formats. --- tests/d3d12.c | 179 ++++++++++++++++++++++++++++++++++++++- tests/d3d12_test_utils.h | 38 +++++++-- 2 files changed, 206 insertions(+), 11 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index b10e25555d68..9c5a5bb9a159 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 * 100 * 64; + + 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 < 64; ++z) + { + for (y = 0; y < 100; ++y) + { + for (x = 0; x < 128; ++x) + { + ptr[z * 128 * 100 + y * 128 + x] = (z + 1) << 16 | (y + 1) << 8 | (x + 1); + } + } + } + ID3D12Resource_Unmap(src_buffer, 0, NULL); + + dst_texture = create_default_texture3d(device, 128, 100, 64, 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 = 100; + src_location.PlacedFootprint.Footprint.Depth = 64; + 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, 100, 64); + 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, 50, 32); + 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 < 64; ++z) + { + for (y = 0; y < 100; ++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 < 32; ++z) + { + for (y = 0; y < 50; ++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..319d52ffe7ec 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; @@ -366,7 +366,7 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi static void *get_readback_data(struct resource_readback *rb, unsigned int x, unsigned int y, unsigned int z, size_t element_size) { - unsigned int slice_pitch = rb->row_pitch * rb->depth; + unsigned int slice_pitch = rb->row_pitch * rb->height; return &((BYTE *)rb->data)[slice_pitch * z + rb->row_pitch * y + x * element_size]; } @@ -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

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel March 2019