From 471a58b4b80ff776fba1d807c9cb211af1d55a4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zef=20Kucia?= Date: Mon, 26 Sep 2016 11:13:30 +0200 Subject: [PATCH] libs/vkd3d: Add ID3D12PipelineState interface stub. --- libs/vkd3d/device.c | 10 ++- libs/vkd3d/state.c | 150 +++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 12 +++ 3 files changed, 171 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index ea04be49..6f6c6c55 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -567,10 +567,18 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateGraphicsPipelineState(ID3D12 static HRESULT STDMETHODCALLTYPE d3d12_device_CreateComputePipelineState(ID3D12Device *iface, const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc, REFIID riid, void **pipeline_state) { + struct d3d12_device *device = impl_from_ID3D12Device(iface); + struct d3d12_pipeline_state *object; + HRESULT hr; + FIXME("iface %p, desc %p, riid %s, pipeline_state %p stub!\n", iface, desc, debugstr_guid(riid), pipeline_state); - return E_NOTIMPL; + if (FAILED(hr = d3d12_pipeline_state_create_compute(device, desc, &object))) + return hr; + + return return_interface((IUnknown *)&object->ID3D12PipelineState_iface, + &IID_ID3D12PipelineState, riid, pipeline_state); } static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandList(ID3D12Device *iface, diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 89606589..f9c4707b 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -160,3 +160,153 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device, return S_OK; } + +/* ID3D12PipelineState */ +static inline struct d3d12_pipeline_state *impl_from_ID3D12PipelineState(ID3D12PipelineState *iface) +{ + return CONTAINING_RECORD(iface, struct d3d12_pipeline_state, ID3D12PipelineState_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_QueryInterface(ID3D12PipelineState *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D12PipelineState) + || IsEqualGUID(riid, &IID_ID3D12Pageable) + || IsEqualGUID(riid, &IID_ID3D12DeviceChild) + || IsEqualGUID(riid, &IID_ID3D12Object) + || IsEqualGUID(riid, &IID_IUnknown)) + { + ID3D12PipelineState_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_AddRef(ID3D12PipelineState *iface) +{ + struct d3d12_pipeline_state *state = impl_from_ID3D12PipelineState(iface); + ULONG refcount = InterlockedIncrement(&state->refcount); + + TRACE("%p increasing refcount to %u.\n", state, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState *iface) +{ + struct d3d12_pipeline_state *state = impl_from_ID3D12PipelineState(iface); + ULONG refcount = InterlockedDecrement(&state->refcount); + + TRACE("%p decreasing refcount to %u.\n", state, refcount); + + if (!refcount) + { + struct d3d12_device *device = state->device; + + vkd3d_free(state); + + ID3D12Device_Release(&device->ID3D12Device_iface); + } + + return refcount; +} + +static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_GetPrivateData(ID3D12PipelineState *iface, + REFGUID guid, UINT *data_size, void *data) +{ + FIXME("iface %p, guid %s, data_size %p, data %p stub!", iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_SetPrivateData(ID3D12PipelineState *iface, + REFGUID guid, UINT data_size, const void *data) +{ + FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_SetPrivateDataInterface(ID3D12PipelineState *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_SetName(ID3D12PipelineState *iface, const WCHAR *name) +{ + FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_GetDevice(ID3D12PipelineState *iface, + REFIID riid, void **device) +{ + struct d3d12_pipeline_state *state = impl_from_ID3D12PipelineState(iface); + + TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device); + + return ID3D12Device_QueryInterface(&state->device->ID3D12Device_iface, riid, device); +} + +static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_GetCachedBlob(ID3D12PipelineState *iface, + ID3DBlob **blob) +{ + FIXME("iface %p, blob %p stub!\n", iface, blob); + + return E_NOTIMPL; +} + +static const struct ID3D12PipelineStateVtbl d3d12_pipeline_state_vtbl = +{ + /* IUnknown methods */ + d3d12_pipeline_state_QueryInterface, + d3d12_pipeline_state_AddRef, + d3d12_pipeline_state_Release, + /* ID3D12Object methods */ + d3d12_pipeline_state_GetPrivateData, + d3d12_pipeline_state_SetPrivateData, + d3d12_pipeline_state_SetPrivateDataInterface, + d3d12_pipeline_state_SetName, + /* ID3D12DeviceChild methods */ + d3d12_pipeline_state_GetDevice, + /* ID3D12PipelineState methods */ + d3d12_pipeline_state_GetCachedBlob, +}; + +static void d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *state, + struct d3d12_device *device, const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc) +{ + state->ID3D12PipelineState_iface.lpVtbl = &d3d12_pipeline_state_vtbl; + state->refcount = 1; + + state->device = device; + ID3D12Device_AddRef(&device->ID3D12Device_iface); +} + +HRESULT d3d12_pipeline_state_create_compute(struct d3d12_device *device, + const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) +{ + struct d3d12_pipeline_state *object; + + if (!(object = vkd3d_malloc(sizeof(*object)))) + return E_OUTOFMEMORY; + + d3d12_pipeline_state_init_compute(object, device, desc); + + TRACE("Created compute pipeline state %p.\n", object); + + *state = object; + + return S_OK; +} diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index c525d3cd..2d0b5e73 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -82,6 +82,18 @@ struct d3d12_root_signature HRESULT d3d12_root_signature_create(struct d3d12_device *device, const D3D12_ROOT_SIGNATURE_DESC *desc, struct d3d12_root_signature **root_signature) DECLSPEC_HIDDEN; +/* ID3D12PipelineState */ +struct d3d12_pipeline_state +{ + ID3D12PipelineState ID3D12PipelineState_iface; + ULONG refcount; + + struct d3d12_device *device; +}; + +HRESULT d3d12_pipeline_state_create_compute(struct d3d12_device *device, + const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN; + /* ID3D12CommandAllocator */ struct d3d12_command_allocator {