[PATCH vkd3d 2/8] tests: Add more tests for copying data from buffers to textures.
Józef Kucia
joseph.kucia at gmail.com
Mon Mar 18 04:02:59 CDT 2019
From: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Józef Kucia <jkucia at 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
More information about the wine-devel
mailing list