wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Implement private data for fences.

Browse Source 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2019-01-03 14:23:02 +01:00 committed by Alexandre Julliard
parent d18360a8b7
commit 0ddd6dbbb6
3 changed files with 147 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libs/vkd3d/command.c
View File

@ -384,6 +384,8 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface)
{ {
struct d3d12_device *device = fence->device; struct d3d12_device *device = fence->device;
vkd3d_private_store_destroy(&fence->private_store);
vkd3d_fence_worker_remove_fence(&device->fence_worker, iface); vkd3d_fence_worker_remove_fence(&device->fence_worker, iface);
vkd3d_free(fence->events); vkd3d_free(fence->events);
@ -400,27 +402,33 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface)
static HRESULT STDMETHODCALLTYPE d3d12_fence_GetPrivateData(ID3D12Fence *iface, static HRESULT STDMETHODCALLTYPE d3d12_fence_GetPrivateData(ID3D12Fence *iface,
REFGUID guid, UINT *data_size, void *data) REFGUID guid, UINT *data_size, void *data)
{ {
FIXME("iface %p, guid %s, data_size %p, data %p stub!", struct d3d12_fence *fence = impl_from_ID3D12Fence(iface);
TRACE("iface %p, guid %s, data_size %p, data %p.\n",
iface, debugstr_guid(guid), data_size, data); iface, debugstr_guid(guid), data_size, data);
return E_NOTIMPL; return vkd3d_get_private_data(&fence->private_store, guid, data_size, data);
} }
static HRESULT STDMETHODCALLTYPE d3d12_fence_SetPrivateData(ID3D12Fence *iface, static HRESULT STDMETHODCALLTYPE d3d12_fence_SetPrivateData(ID3D12Fence *iface,
REFGUID guid, UINT data_size, const void *data) REFGUID guid, UINT data_size, const void *data)
{ {
FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", struct d3d12_fence *fence = impl_from_ID3D12Fence(iface);
TRACE("iface %p, guid %s, data_size %u, data %p.\n",
iface, debugstr_guid(guid), data_size, data); iface, debugstr_guid(guid), data_size, data);
return E_NOTIMPL; return vkd3d_set_private_data(&fence->private_store, guid, data_size, data);
} }
static HRESULT STDMETHODCALLTYPE d3d12_fence_SetPrivateDataInterface(ID3D12Fence *iface, static HRESULT STDMETHODCALLTYPE d3d12_fence_SetPrivateDataInterface(ID3D12Fence *iface,
REFGUID guid, const IUnknown *data) REFGUID guid, const IUnknown *data)
{ {
FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); struct d3d12_fence *fence = impl_from_ID3D12Fence(iface);
return E_NOTIMPL; TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data);
return vkd3d_set_private_data_interface(&fence->private_store, guid, data);
} }
static HRESULT STDMETHODCALLTYPE d3d12_fence_SetName(ID3D12Fence *iface, const WCHAR *name) static HRESULT STDMETHODCALLTYPE d3d12_fence_SetName(ID3D12Fence *iface, const WCHAR *name)
@ -590,6 +598,8 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *
fence->events_size = 0; fence->events_size = 0;
fence->event_count = 0; fence->event_count = 0;
vkd3d_private_store_init(&fence->private_store);
fence->device = device; fence->device = device;
ID3D12Device_AddRef(&device->ID3D12Device_iface); ID3D12Device_AddRef(&device->ID3D12Device_iface);

2
libs/vkd3d/vkd3d_private.h
View File

@ -230,6 +230,8 @@ struct d3d12_fence
size_t event_count; size_t event_count;
struct d3d12_device *device; struct d3d12_device *device;
struct vkd3d_private_store private_store;
}; };
HRESULT d3d12_fence_create(struct d3d12_device *device, HRESULT d3d12_fence_create(struct d3d12_device *device,

226
tests/d3d12.c
View File

@ -2565,7 +2565,9 @@ static void test_private_data(void)
IUnknown *test_object; IUnknown *test_object;
ID3D12Device *device; ID3D12Device *device;
ID3D12Object *object; ID3D12Object *object;
ID3D12Fence *fence;
unsigned int size; unsigned int size;
unsigned int i;
IUnknown *ptr; IUnknown *ptr;
HRESULT hr; HRESULT hr;
@ -2574,6 +2576,11 @@ static void test_private_data(void)
static const GUID test_guid2 static const GUID test_guid2
= {0x2e5afac2, 0x87b5, 0x4c10, {0x9b, 0x4b, 0x89, 0xd7, 0xd1, 0x12, 0xe7, 0x2b}}; = {0x2e5afac2, 0x87b5, 0x4c10, {0x9b, 0x4b, 0x89, 0xd7, 0xd1, 0x12, 0xe7, 0x2b}};
static const DWORD data[] = {1, 2, 3, 4}; static const DWORD data[] = {1, 2, 3, 4};
static const GUID *tests[] =
{
&IID_ID3D12CommandQueue,
&IID_ID3D12Fence,
};
if (!(device = create_device())) if (!(device = create_device()))
{ {
@ -2581,114 +2588,139 @@ static void test_private_data(void)
return; return;
} }
queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; for (i = 0; i < ARRAY_SIZE(tests); ++i)
queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; {
queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; object = NULL;
queue_desc.NodeMask = 0; if (IsEqualGUID(tests[i], &IID_ID3D12CommandQueue))
hr = ID3D12Device_CreateCommandQueue(device, &queue_desc, &IID_ID3D12CommandQueue, (void **)&queue); {
ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); vkd3d_test_set_context("queue");
hr = ID3D12CommandQueue_QueryInterface(queue, &IID_ID3D12Object, (void **)&object); queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT;
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL;
ID3D12CommandQueue_Release(queue); queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE;
queue_desc.NodeMask = 0;
hr = ID3D12Device_CreateCommandQueue(device, &queue_desc,
&IID_ID3D12CommandQueue, (void **)&queue);
ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr);
hr = ID3D12CommandQueue_QueryInterface(queue, &IID_ID3D12Object, (void **)&object);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
ID3D12CommandQueue_Release(queue);
}
else if (IsEqualGUID(tests[i], &IID_ID3D12Fence))
{
vkd3d_test_set_context("fence");
hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE,
&IID_ID3D12Fence, (void **)&fence);
ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr);
hr = ID3D12Fence_QueryInterface(fence, &IID_ID3D12Object, (void **)&object);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
ID3D12Fence_Release(fence);
}
else
{
ok(false, "Unhandled object type %u.\n", i);
}
hr = ID3D12Object_SetPrivateData(object, &test_guid, 0, NULL); hr = ID3D12Object_SetPrivateData(object, &test_guid, 0, NULL);
ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr);
hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, NULL); hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, NULL);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
hr = ID3D12Object_SetPrivateData(object, &test_guid, ~0u, NULL); hr = ID3D12Object_SetPrivateData(object, &test_guid, ~0u, NULL);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
hr = ID3D12Object_SetPrivateData(object, &test_guid, ~0u, NULL); hr = ID3D12Object_SetPrivateData(object, &test_guid, ~0u, NULL);
ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr);
hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, NULL); hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, NULL);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
size = sizeof(ptr) * 2; size = sizeof(ptr) * 2;
ptr = (IUnknown *)0xdeadbeef; ptr = (IUnknown *)0xdeadbeef;
hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, &ptr); hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, &ptr);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
ok(!ptr, "Got unexpected pointer %p.\n", ptr); ok(!ptr, "Got unexpected pointer %p.\n", ptr);
ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size);
hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE,
&IID_ID3D12Fence, (void **)&test_object); &IID_ID3D12Fence, (void **)&test_object);
ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr);
refcount = get_refcount(test_object); refcount = get_refcount(test_object);
hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object); hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
expected_refcount = refcount + 1; expected_refcount = refcount + 1;
refcount = get_refcount(test_object); refcount = get_refcount(test_object);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n",
(unsigned int)refcount, (unsigned int)expected_refcount); (unsigned int)refcount, (unsigned int)expected_refcount);
hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object); hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
refcount = get_refcount(test_object); refcount = get_refcount(test_object);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n",
(unsigned int)refcount, (unsigned int)expected_refcount); (unsigned int)refcount, (unsigned int)expected_refcount);
hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, NULL); hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, NULL);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
--expected_refcount; --expected_refcount;
refcount = get_refcount(test_object); refcount = get_refcount(test_object);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n",
(unsigned int)refcount, (unsigned int)expected_refcount); (unsigned int)refcount, (unsigned int)expected_refcount);
hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object); hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
size = sizeof(data); size = sizeof(data);
hr = ID3D12Object_SetPrivateData(object, &test_guid, size, data); hr = ID3D12Object_SetPrivateData(object, &test_guid, size, data);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
refcount = get_refcount(test_object); refcount = get_refcount(test_object);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n",
(unsigned int)refcount, (unsigned int)expected_refcount); (unsigned int)refcount, (unsigned int)expected_refcount);
hr = ID3D12Object_SetPrivateData(object, &test_guid, 42, NULL); hr = ID3D12Object_SetPrivateData(object, &test_guid, 42, NULL);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
hr = ID3D12Object_SetPrivateData(object, &test_guid, 42, NULL); hr = ID3D12Object_SetPrivateData(object, &test_guid, 42, NULL);
ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr);
hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object); hr = ID3D12Object_SetPrivateDataInterface(object, &test_guid, (IUnknown *)test_object);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
++expected_refcount; ++expected_refcount;
size = 2 * sizeof(ptr); size = 2 * sizeof(ptr);
ptr = NULL; ptr = NULL;
hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, &ptr); hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, &ptr);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
ok(size == sizeof(test_object), "Got unexpected size %u.\n", size); ok(size == sizeof(test_object), "Got unexpected size %u.\n", size);
++expected_refcount; ++expected_refcount;
refcount = get_refcount(test_object); refcount = get_refcount(test_object);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n",
(unsigned int)refcount, (unsigned int)expected_refcount); (unsigned int)refcount, (unsigned int)expected_refcount);
IUnknown_Release(ptr); IUnknown_Release(ptr);
--expected_refcount; --expected_refcount;
ptr = (IUnknown *)0xdeadbeef; ptr = (IUnknown *)0xdeadbeef;
size = 1; size = 1;
hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, NULL); hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, NULL);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
ok(size == sizeof(ptr), "Got unexpected size %u.\n", size); ok(size == sizeof(ptr), "Got unexpected size %u.\n", size);
size = 2 * sizeof(ptr); size = 2 * sizeof(ptr);
hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, NULL); hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, NULL);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
ok(size == sizeof(ptr), "Got unexpected size %u.\n", size); ok(size == sizeof(ptr), "Got unexpected size %u.\n", size);
refcount = get_refcount(test_object); refcount = get_refcount(test_object);
ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n",
(unsigned int)refcount, (unsigned int)expected_refcount); (unsigned int)refcount, (unsigned int)expected_refcount);
size = 1; size = 1;
hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, &ptr); hr = ID3D12Object_GetPrivateData(object, &test_guid, &size, &ptr);
ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr);
ok(size == sizeof(object), "Got unexpected size %u.\n", size); ok(size == sizeof(object), "Got unexpected size %u.\n", size);
ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr);
size = 1; size = 1;
hr = ID3D12Object_GetPrivateData(object, &test_guid2, &size, &ptr); hr = ID3D12Object_GetPrivateData(object, &test_guid2, &size, &ptr);
ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr);
ok(!size, "Got unexpected size %u.\n", size); ok(!size, "Got unexpected size %u.\n", size);
ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr);
ID3D12Object_Release(object); ID3D12Object_Release(object);
refcount = IUnknown_Release(test_object); refcount = IUnknown_Release(test_object);
ok(!refcount, "Test object has %u references left.\n", (unsigned int)refcount); ok(!refcount, "Test object has %u references left.\n", (unsigned int)refcount);
vkd3d_test_set_context(NULL);
}
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);