Module: wine Branch: master Commit: ecc577312e203484d757056ef3bdf548679b81ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecc577312e203484d757056ef3...
Author: Józef Kucia jkucia@codeweavers.com Date: Fri Apr 22 11:18:48 2016 +0200
d3d11: Add ID3D11ClassLinkage interface stub.
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
---
dlls/d3d11/d3d11_private.h | 12 ++++ dlls/d3d11/device.c | 13 ++++- dlls/d3d11/shader.c | 142 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 165 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 17e9f9f..cfc50a8 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -315,6 +315,18 @@ struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *i HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN;
+/* ID3D11ClassLinkage */ +struct d3d11_class_linkage +{ + ID3D11ClassLinkage ID3D11ClassLinkage_iface; + LONG refcount; + + struct wined3d_private_store private_store; +}; + +HRESULT d3d11_class_linkage_create(struct d3d_device *device, + struct d3d11_class_linkage **class_linkage) DECLSPEC_HIDDEN; + /* ID3D11BlendState, ID3D10BlendState1 */ struct d3d_blend_state { diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index fd88ac1..7fb28ac 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2241,9 +2241,18 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateComputeShader(ID3D11Device * static HRESULT STDMETHODCALLTYPE d3d11_device_CreateClassLinkage(ID3D11Device *iface, ID3D11ClassLinkage **class_linkage) { - FIXME("iface %p, class_linkage %p stub!\n", iface, class_linkage); + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d11_class_linkage *object; + HRESULT hr;
- return E_NOTIMPL; + TRACE("iface %p, class_linkage %p.\n", iface, class_linkage); + + if (FAILED(hr = d3d11_class_linkage_create(device, &object))) + return hr; + + *class_linkage = &object->ID3D11ClassLinkage_iface; + + return S_OK; }
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState(ID3D11Device *iface, diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index bf6bb32..0b6b29e 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -1507,3 +1507,145 @@ struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *i
return impl_from_ID3D10PixelShader(iface); } + +/* ID3D11ClassLinkage methods */ + +static inline struct d3d11_class_linkage *impl_from_ID3D11ClassLinkage(ID3D11ClassLinkage *iface) +{ + return CONTAINING_RECORD(iface, struct d3d11_class_linkage, ID3D11ClassLinkage_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d11_class_linkage_QueryInterface(ID3D11ClassLinkage *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D11ClassLinkage) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + ID3D11ClassLinkage_AddRef(*object = iface); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d11_class_linkage_AddRef(ID3D11ClassLinkage *iface) +{ + struct d3d11_class_linkage *class_linkage = impl_from_ID3D11ClassLinkage(iface); + ULONG refcount = InterlockedIncrement(&class_linkage->refcount); + + TRACE("%p increasing refcount to %u.\n", class_linkage, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d11_class_linkage_Release(ID3D11ClassLinkage *iface) +{ + struct d3d11_class_linkage *class_linkage = impl_from_ID3D11ClassLinkage(iface); + ULONG refcount = InterlockedDecrement(&class_linkage->refcount); + + TRACE("%p decreasing refcount to %u.\n", class_linkage, refcount); + + if (!refcount) + { + wined3d_private_store_cleanup(&class_linkage->private_store); + HeapFree(GetProcessHeap(), 0, class_linkage); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d3d11_class_linkage_GetDevice(ID3D11ClassLinkage *iface, + ID3D11Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_class_linkage_GetPrivateData(ID3D11ClassLinkage *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d11_class_linkage *class_linkage = impl_from_ID3D11ClassLinkage(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&class_linkage->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_class_linkage_SetPrivateData(ID3D11ClassLinkage *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d11_class_linkage *class_linkage = impl_from_ID3D11ClassLinkage(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&class_linkage->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_class_linkage_SetPrivateDataInterface(ID3D11ClassLinkage *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d11_class_linkage *class_linkage = impl_from_ID3D11ClassLinkage(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&class_linkage->private_store, guid, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_class_linkage_GetClassInstance(ID3D11ClassLinkage *iface, + const char *instance_name, UINT instance_index, ID3D11ClassInstance **class_instance) +{ + FIXME("iface %p, instance_name %s, instance_index %u, class_instance %p stub!\n", + iface, debugstr_a(instance_name), instance_index, class_instance); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d11_class_linkage_CreateClassInstance(ID3D11ClassLinkage *iface, + const char *type_name, UINT cb_offset, UINT cb_vector_offset, UINT texture_offset, + UINT sampler_offset, ID3D11ClassInstance **class_instance) +{ + FIXME("iface %p, type_name %s, cb_offset %u, cb_vector_offset %u, texture_offset %u, " + "sampler_offset %u, class_instance %p stub!\n", + iface, debugstr_a(type_name), cb_offset, cb_vector_offset, texture_offset, + sampler_offset, class_instance); + + return E_NOTIMPL; +} + +static const struct ID3D11ClassLinkageVtbl d3d11_class_linkage_vtbl = +{ + /* IUnknown methods */ + d3d11_class_linkage_QueryInterface, + d3d11_class_linkage_AddRef, + d3d11_class_linkage_Release, + /* ID3D11DeviceChild methods */ + d3d11_class_linkage_GetDevice, + d3d11_class_linkage_GetPrivateData, + d3d11_class_linkage_SetPrivateData, + d3d11_class_linkage_SetPrivateDataInterface, + /* ID3D11ClassLinkage methods */ + d3d11_class_linkage_GetClassInstance, + d3d11_class_linkage_CreateClassInstance, +}; + +HRESULT d3d11_class_linkage_create(struct d3d_device *device, struct d3d11_class_linkage **class_linkage) +{ + struct d3d11_class_linkage *object; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + object->ID3D11ClassLinkage_iface.lpVtbl = &d3d11_class_linkage_vtbl; + object->refcount = 1; + wined3d_private_store_init(&object->private_store); + + TRACE("Created class linkage %p.\n", object); + *class_linkage = object; + + return S_OK; +}