wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

tests: Use create_default_buffer() helper in test_execute_indirect().

Browse Source
This commit is contained in:
Józef Kucia 2017-08-29 10:32:24 +02:00
parent a624787479
commit 42726ea86b
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/d3d12.c
View File

@ -11495,12 +11495,10 @@ static void test_execute_indirect(void)
D3D12_INDIRECT_ARGUMENT_DESC argument_desc; D3D12_INDIRECT_ARGUMENT_DESC argument_desc;
ID3D12CommandSignature *command_signature; ID3D12CommandSignature *command_signature;
ID3D12GraphicsCommandList *command_list; ID3D12GraphicsCommandList *command_list;
D3D12_HEAP_PROPERTIES heap_properties;
ID3D12Resource *argument_buffer, *uav; ID3D12Resource *argument_buffer, *uav;
D3D12_ROOT_PARAMETER root_parameter; D3D12_ROOT_PARAMETER root_parameter;
ID3D12PipelineState *pipeline_state; ID3D12PipelineState *pipeline_state;
ID3D12RootSignature *root_signature; ID3D12RootSignature *root_signature;
D3D12_RESOURCE_DESC resource_desc;
struct resource_readback rb; struct resource_readback rb;
struct test_context context; struct test_context context;
ID3D12CommandQueue *queue; ID3D12CommandQueue *queue;
@ -11581,25 +11579,8 @@ static void test_execute_indirect(void)
NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); NULL, &IID_ID3D12CommandSignature, (void **)&command_signature);
ok(SUCCEEDED(hr), "Failed to create command signature, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Failed to create command signature, hr %#x.\n", hr);
memset(&heap_properties, 0, sizeof(heap_properties)); uav = create_default_buffer(context.device, 2 * 3 * 4 * sizeof(UINT),
heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER;
resource_desc.Alignment = 0;
resource_desc.Width = 2 * 3 * 4 * sizeof(UINT);
resource_desc.Height = 1;
resource_desc.DepthOrArraySize = 1;
resource_desc.MipLevels = 1;
resource_desc.Format = DXGI_FORMAT_UNKNOWN;
resource_desc.SampleDesc.Count = 1;
resource_desc.SampleDesc.Quality = 0;
resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR;
resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS;
hr = ID3D12Device_CreateCommittedResource(context.device, &heap_properties,
D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_UNORDERED_ACCESS,
NULL, &IID_ID3D12Resource, (void **)&uav);
ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr);
root_parameter.ParameterType = D3D12_ROOT_PARAMETER_TYPE_UAV; root_parameter.ParameterType = D3D12_ROOT_PARAMETER_TYPE_UAV;
root_parameter.Descriptor.ShaderRegister = 0; root_parameter.Descriptor.ShaderRegister = 0;
@ -11624,8 +11605,8 @@ static void test_execute_indirect(void)
transition_sub_resource_state(command_list, uav, 0, transition_sub_resource_state(command_list, uav, 0,
D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE);
get_buffer_readback_with_command_list(uav, resource_desc.Format, &rb, queue, command_list); get_buffer_readback_with_command_list(uav, DXGI_FORMAT_R32_UINT, &rb, queue, command_list);
for (i = 0; i < 2 * 3 * 4; ++i) for (i = 0; i < rb.width; ++i)
{ {
unsigned int ret = get_readback_uint(&rb, i, 0); unsigned int ret = get_readback_uint(&rb, i, 0);
ok(ret == i, "Got unexpected result %#x at index %u.\n", ret, i); ok(ret == i, "Got unexpected result %#x at index %u.\n", ret, i);