wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

libs/vkd3d: Command allocator can be used with one command list at a time.

Browse Source
This commit is contained in:
Józef Kucia 2016-10-20 16:38:04 +02:00
parent 384bb26ea5
commit 2189859532
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/vkd3d/command.c
View File

@ -549,8 +549,8 @@ static HRESULT d3d12_command_allocator_allocate_command_buffer(struct d3d12_comm
if (allocator->current_command_list) if (allocator->current_command_list)
{ {
FIXME("Allocation for multiple command list not supported.\n"); WARN("Command allocator is already in use.\n");
return E_NOTIMPL; return E_INVALIDARG;
} }
command_buffer_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; command_buffer_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;

17
tests/d3d12.c
View File

@ -1274,8 +1274,8 @@ static void test_create_fence(void)
static void test_reset_command_allocator(void) static void test_reset_command_allocator(void)
{ {
ID3D12CommandAllocator *command_allocator, *command_allocator2; ID3D12CommandAllocator *command_allocator, *command_allocator2;
ID3D12GraphicsCommandList *command_list, *command_list2;
D3D12_COMMAND_QUEUE_DESC command_queue_desc; D3D12_COMMAND_QUEUE_DESC command_queue_desc;
ID3D12GraphicsCommandList *command_list;
ID3D12CommandQueue *queue; ID3D12CommandQueue *queue;
ID3D12Device *device; ID3D12Device *device;
ULONG refcount; ULONG refcount;
@ -1354,10 +1354,25 @@ static void test_reset_command_allocator(void)
hr = ID3D12GraphicsCommandList_Reset(command_list, command_allocator, NULL); hr = ID3D12GraphicsCommandList_Reset(command_list, command_allocator, NULL);
ok(SUCCEEDED(hr), "Resetting command list failed, hr %#x.\n", hr); ok(SUCCEEDED(hr), "Resetting command list failed, hr %#x.\n", hr);
/* A command allocator can be used with one command list at a time. */
hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT,
command_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list2);
ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT,
command_allocator2, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list2);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
hr = ID3D12GraphicsCommandList_Close(command_list2);
ok(SUCCEEDED(hr), "Close failed, hr %#x.\n", hr);
hr = ID3D12GraphicsCommandList_Reset(command_list2, command_allocator, NULL);
ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
ID3D12CommandAllocator_Release(command_allocator); ID3D12CommandAllocator_Release(command_allocator);
ID3D12CommandAllocator_Release(command_allocator2); ID3D12CommandAllocator_Release(command_allocator2);
ID3D12CommandQueue_Release(queue); ID3D12CommandQueue_Release(queue);
ID3D12GraphicsCommandList_Release(command_list); ID3D12GraphicsCommandList_Release(command_list);
ID3D12GraphicsCommandList_Release(command_list2);
refcount = ID3D12Device_Release(device); refcount = ID3D12Device_Release(device);
ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);
} }