diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index e702b41eda6..c7372734a87 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -149,9 +149,10 @@ HRESULT d3d_buffer_create(struct d3d_device *device, const D3D11_BUFFER_DESC *de const D3D11_SUBRESOURCE_DATA *data, struct d3d_buffer **buffer) DECLSPEC_HIDDEN; struct d3d_buffer *unsafe_impl_from_ID3D10Buffer(ID3D10Buffer *iface) DECLSPEC_HIDDEN; -/* ID3D10DepthStencilView */ +/* ID3D11DepthStencilView, ID3D10DepthStencilView */ struct d3d_depthstencil_view { + ID3D11DepthStencilView ID3D11DepthStencilView_iface; ID3D10DepthStencilView ID3D10DepthStencilView_iface; LONG refcount; diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index eaf34a39abd..2d9e5d8b5f0 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -357,6 +357,143 @@ static HRESULT set_srdesc_from_resource(D3D10_SHADER_RESOURCE_VIEW_DESC *desc, I } } +/* ID3D11DepthStencilView methods */ + +static inline struct d3d_depthstencil_view *impl_from_ID3D11DepthStencilView(ID3D11DepthStencilView *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_depthstencil_view, ID3D11DepthStencilView_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d11_depthstencil_view_QueryInterface(ID3D11DepthStencilView *iface, + REFIID riid, void **object) +{ + struct d3d_depthstencil_view *view = impl_from_ID3D11DepthStencilView(iface); + + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D11DepthStencilView) + || IsEqualGUID(riid, &IID_ID3D11View) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + ID3D11DepthStencilView_AddRef(iface); + *object = iface; + return S_OK; + } + + if (IsEqualGUID(riid, &IID_ID3D10DepthStencilView) + || IsEqualGUID(riid, &IID_ID3D10View) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild)) + { + ID3D10DepthStencilView_AddRef(&view->ID3D10DepthStencilView_iface); + *object = &view->ID3D10DepthStencilView_iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_AddRef(ID3D11DepthStencilView *iface) +{ + struct d3d_depthstencil_view *view = impl_from_ID3D11DepthStencilView(iface); + ULONG refcount = InterlockedIncrement(&view->refcount); + + TRACE("%p increasing refcount to %u.\n", view, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_Release(ID3D11DepthStencilView *iface) +{ + struct d3d_depthstencil_view *view = impl_from_ID3D11DepthStencilView(iface); + ULONG refcount = InterlockedDecrement(&view->refcount); + + TRACE("%p decreasing refcount to %u.\n", view, refcount); + + if (!refcount) + { + wined3d_mutex_lock(); + wined3d_rendertarget_view_decref(view->wined3d_view); + ID3D10Resource_Release(view->resource); + ID3D10Device1_Release(view->device); + wined3d_private_store_cleanup(&view->private_store); + wined3d_mutex_unlock(); + HeapFree(GetProcessHeap(), 0, view); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d3d11_depthstencil_view_GetDevice(ID3D11DepthStencilView *iface, + ID3D11Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_depthstencil_view_GetPrivateData(ID3D11DepthStencilView *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d_depthstencil_view *view = impl_from_ID3D11DepthStencilView(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&view->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_depthstencil_view_SetPrivateData(ID3D11DepthStencilView *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d_depthstencil_view *view = impl_from_ID3D11DepthStencilView(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&view->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_depthstencil_view_SetPrivateDataInterface(ID3D11DepthStencilView *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d_depthstencil_view *view = impl_from_ID3D11DepthStencilView(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&view->private_store, guid, data); +} + +static void STDMETHODCALLTYPE d3d11_depthstencil_view_GetResource(ID3D11DepthStencilView *iface, + ID3D11Resource **resource) +{ + FIXME("iface %p, resource %p stub!\n", iface, resource); +} + +static void STDMETHODCALLTYPE d3d11_depthstencil_view_GetDesc(ID3D11DepthStencilView *iface, + D3D11_DEPTH_STENCIL_VIEW_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static const struct ID3D11DepthStencilViewVtbl d3d11_depthstencil_view_vtbl = +{ + /* IUnknown methods */ + d3d11_depthstencil_view_QueryInterface, + d3d11_depthstencil_view_AddRef, + d3d11_depthstencil_view_Release, + /* ID3D11DeviceChild methods */ + d3d11_depthstencil_view_GetDevice, + d3d11_depthstencil_view_GetPrivateData, + d3d11_depthstencil_view_SetPrivateData, + d3d11_depthstencil_view_SetPrivateDataInterface, + /* ID3D11View methods */ + d3d11_depthstencil_view_GetResource, + /* ID3D11DepthStencilView methods */ + d3d11_depthstencil_view_GetDesc, +}; + +/* ID3D10DepthStencilView methods */ + static inline struct d3d_depthstencil_view *impl_from_ID3D10DepthStencilView(ID3D10DepthStencilView *iface) { return CONTAINING_RECORD(iface, struct d3d_depthstencil_view, ID3D10DepthStencilView_iface); @@ -367,53 +504,29 @@ static inline struct d3d_depthstencil_view *impl_from_ID3D10DepthStencilView(ID3 static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_QueryInterface(ID3D10DepthStencilView *iface, REFIID riid, void **object) { + struct d3d_depthstencil_view *view = impl_from_ID3D10DepthStencilView(iface); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - if (IsEqualGUID(riid, &IID_ID3D10DepthStencilView) - || IsEqualGUID(riid, &IID_ID3D10View) - || IsEqualGUID(riid, &IID_ID3D10DeviceChild) - || IsEqualGUID(riid, &IID_IUnknown)) - { - IUnknown_AddRef(iface); - *object = iface; - return S_OK; - } - - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - - *object = NULL; - return E_NOINTERFACE; + return d3d11_depthstencil_view_QueryInterface(&view->ID3D11DepthStencilView_iface, riid, object); } static ULONG STDMETHODCALLTYPE d3d10_depthstencil_view_AddRef(ID3D10DepthStencilView *iface) { - struct d3d_depthstencil_view *This = impl_from_ID3D10DepthStencilView(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct d3d_depthstencil_view *view = impl_from_ID3D10DepthStencilView(iface); - TRACE("%p increasing refcount to %u.\n", This, refcount); + TRACE("iface %p.\n", iface); - return refcount; + return d3d11_depthstencil_view_AddRef(&view->ID3D11DepthStencilView_iface); } static ULONG STDMETHODCALLTYPE d3d10_depthstencil_view_Release(ID3D10DepthStencilView *iface) { - struct d3d_depthstencil_view *This = impl_from_ID3D10DepthStencilView(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d_depthstencil_view *view = impl_from_ID3D10DepthStencilView(iface); - TRACE("%p decreasing refcount to %u.\n", This, refcount); + TRACE("iface %p.\n", iface); - if (!refcount) - { - wined3d_mutex_lock(); - wined3d_rendertarget_view_decref(This->wined3d_view); - ID3D10Resource_Release(This->resource); - ID3D10Device1_Release(This->device); - wined3d_private_store_cleanup(&This->private_store); - wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, This); - } - - return refcount; + return d3d11_depthstencil_view_Release(&view->ID3D11DepthStencilView_iface); } /* ID3D10DeviceChild methods */ @@ -561,6 +674,7 @@ HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, struct d3 struct wined3d_resource *wined3d_resource; HRESULT hr; + view->ID3D11DepthStencilView_iface.lpVtbl = &d3d11_depthstencil_view_vtbl; view->ID3D10DepthStencilView_iface.lpVtbl = &d3d10_depthstencil_view_vtbl; view->refcount = 1;