=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: d3d11: Add ID3D11RenderTargetView interface stub.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Sep 9 09:57:37 CDT 2015
Module: wine
Branch: master
Commit: b5b5b381f469870be81a109b6627170d9eafb20e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5b5b381f469870be81a109b6627170d9eafb20e
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Wed Sep 9 01:35:42 2015 +0200
d3d11: Add ID3D11RenderTargetView interface stub.
---
dlls/d3d11/d3d11_private.h | 3 +-
dlls/d3d11/view.c | 162 ++++++++++++++++++++++++++++++++++++++-------
2 files changed, 140 insertions(+), 25 deletions(-)
diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h
index ea6e834..58e5912 100644
--- a/dlls/d3d11/d3d11_private.h
+++ b/dlls/d3d11/d3d11_private.h
@@ -170,9 +170,10 @@ HRESULT d3d_depthstencil_view_create(struct d3d_device *device, ID3D11Resource *
const D3D11_DEPTH_STENCIL_VIEW_DESC *desc, struct d3d_depthstencil_view **view) DECLSPEC_HIDDEN;
struct d3d_depthstencil_view *unsafe_impl_from_ID3D10DepthStencilView(ID3D10DepthStencilView *iface) DECLSPEC_HIDDEN;
-/* ID3D10RenderTargetView */
+/* ID3D11RenderTargetView, ID3D10RenderTargetView */
struct d3d_rendertarget_view
{
+ ID3D11RenderTargetView ID3D11RenderTargetView_iface;
ID3D10RenderTargetView ID3D10RenderTargetView_iface;
LONG refcount;
diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c
index 4fc77f5..7f7dcfd 100644
--- a/dlls/d3d11/view.c
+++ b/dlls/d3d11/view.c
@@ -766,65 +766,178 @@ struct d3d_depthstencil_view *unsafe_impl_from_ID3D10DepthStencilView(ID3D10Dept
return impl_from_ID3D10DepthStencilView(iface);
}
-static inline struct d3d_rendertarget_view *impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface)
+/* ID3D11RenderTargetView methods */
+
+static inline struct d3d_rendertarget_view *impl_from_ID3D11RenderTargetView(ID3D11RenderTargetView *iface)
{
- return CONTAINING_RECORD(iface, struct d3d_rendertarget_view, ID3D10RenderTargetView_iface);
+ return CONTAINING_RECORD(iface, struct d3d_rendertarget_view, ID3D11RenderTargetView_iface);
}
-/* IUnknown methods */
-
-static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_QueryInterface(ID3D10RenderTargetView *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_rendertarget_view_QueryInterface(ID3D11RenderTargetView *iface,
REFIID riid, void **object)
{
- TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object);
+ struct d3d_rendertarget_view *view = impl_from_ID3D11RenderTargetView(iface);
- if (IsEqualGUID(riid, &IID_ID3D10RenderTargetView)
- || IsEqualGUID(riid, &IID_ID3D10View)
- || IsEqualGUID(riid, &IID_ID3D10DeviceChild)
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
+
+ if (IsEqualGUID(riid, &IID_ID3D11RenderTargetView)
+ || IsEqualGUID(riid, &IID_ID3D11View)
+ || IsEqualGUID(riid, &IID_ID3D11DeviceChild)
|| IsEqualGUID(riid, &IID_IUnknown))
{
- IUnknown_AddRef(iface);
+ ID3D11RenderTargetView_AddRef(iface);
*object = iface;
return S_OK;
}
- WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid));
+ if (IsEqualGUID(riid, &IID_ID3D10RenderTargetView)
+ || IsEqualGUID(riid, &IID_ID3D10View)
+ || IsEqualGUID(riid, &IID_ID3D10DeviceChild))
+ {
+ ID3D10RenderTargetView_AddRef(&view->ID3D10RenderTargetView_iface);
+ *object = &view->ID3D10RenderTargetView_iface;
+ return S_OK;
+ }
+
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
*object = NULL;
return E_NOINTERFACE;
}
-static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_AddRef(ID3D10RenderTargetView *iface)
+static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_AddRef(ID3D11RenderTargetView *iface)
{
- struct d3d_rendertarget_view *This = impl_from_ID3D10RenderTargetView(iface);
- ULONG refcount = InterlockedIncrement(&This->refcount);
+ struct d3d_rendertarget_view *view = impl_from_ID3D11RenderTargetView(iface);
+ ULONG refcount = InterlockedIncrement(&view->refcount);
- TRACE("%p increasing refcount to %u\n", This, refcount);
+ TRACE("%p increasing refcount to %u.\n", view, refcount);
return refcount;
}
-static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_Release(ID3D10RenderTargetView *iface)
+static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_Release(ID3D11RenderTargetView *iface)
{
- struct d3d_rendertarget_view *This = impl_from_ID3D10RenderTargetView(iface);
- ULONG refcount = InterlockedDecrement(&This->refcount);
+ struct d3d_rendertarget_view *view = impl_from_ID3D11RenderTargetView(iface);
+ ULONG refcount = InterlockedDecrement(&view->refcount);
- TRACE("%p decreasing refcount to %u\n", This, refcount);
+ TRACE("%p decreasing refcount to %u.\n", view, refcount);
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_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, This);
+ HeapFree(GetProcessHeap(), 0, view);
}
return refcount;
}
+static void STDMETHODCALLTYPE d3d11_rendertarget_view_GetDevice(ID3D11RenderTargetView *iface,
+ ID3D11Device **device)
+{
+ FIXME("iface %p, device %p stub!\n", iface, device);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d11_rendertarget_view_GetPrivateData(ID3D11RenderTargetView *iface,
+ REFGUID guid, UINT *data_size, void *data)
+{
+ struct d3d_rendertarget_view *view = impl_from_ID3D11RenderTargetView(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_rendertarget_view_SetPrivateData(ID3D11RenderTargetView *iface,
+ REFGUID guid, UINT data_size, const void *data)
+{
+ struct d3d_rendertarget_view *view = impl_from_ID3D11RenderTargetView(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_rendertarget_view_SetPrivateDataInterface(ID3D11RenderTargetView *iface,
+ REFGUID guid, const IUnknown *data)
+{
+ struct d3d_rendertarget_view *view = impl_from_ID3D11RenderTargetView(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_rendertarget_view_GetResource(ID3D11RenderTargetView *iface,
+ ID3D11Resource **resource)
+{
+ FIXME("iface %p, resource %p stub!\n", iface, resource);
+}
+
+static void STDMETHODCALLTYPE d3d11_rendertarget_view_GetDesc(ID3D11RenderTargetView *iface,
+ D3D11_RENDER_TARGET_VIEW_DESC *desc)
+{
+ FIXME("iface %p, desc %p stub!\n", iface, desc);
+}
+
+static const struct ID3D11RenderTargetViewVtbl d3d11_rendertarget_view_vtbl =
+{
+ /* IUnknown methods */
+ d3d11_rendertarget_view_QueryInterface,
+ d3d11_rendertarget_view_AddRef,
+ d3d11_rendertarget_view_Release,
+ /* ID3D11DeviceChild methods */
+ d3d11_rendertarget_view_GetDevice,
+ d3d11_rendertarget_view_GetPrivateData,
+ d3d11_rendertarget_view_SetPrivateData,
+ d3d11_rendertarget_view_SetPrivateDataInterface,
+ /* ID3D11View methods */
+ d3d11_rendertarget_view_GetResource,
+ /* ID3D11RenderTargetView methods */
+ d3d11_rendertarget_view_GetDesc,
+};
+
+/* ID3D10RenderTargetView methods */
+
+static inline struct d3d_rendertarget_view *impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface)
+{
+ return CONTAINING_RECORD(iface, struct d3d_rendertarget_view, ID3D10RenderTargetView_iface);
+}
+
+/* IUnknown methods */
+
+static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_QueryInterface(ID3D10RenderTargetView *iface,
+ REFIID riid, void **object)
+{
+ struct d3d_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface);
+
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
+
+ return d3d11_rendertarget_view_QueryInterface(&view->ID3D11RenderTargetView_iface, riid, object);
+}
+
+static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_AddRef(ID3D10RenderTargetView *iface)
+{
+ struct d3d_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return d3d11_rendertarget_view_AddRef(&view->ID3D11RenderTargetView_iface);
+}
+
+static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_Release(ID3D10RenderTargetView *iface)
+{
+ struct d3d_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return d3d11_rendertarget_view_Release(&view->ID3D11RenderTargetView_iface);
+}
+
/* ID3D10DeviceChild methods */
static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDevice(ID3D10RenderTargetView *iface, ID3D10Device **device)
@@ -981,6 +1094,7 @@ HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, struct d3
struct wined3d_resource *wined3d_resource;
HRESULT hr;
+ view->ID3D11RenderTargetView_iface.lpVtbl = &d3d11_rendertarget_view_vtbl;
view->ID3D10RenderTargetView_iface.lpVtbl = &d3d10_rendertarget_view_vtbl;
view->refcount = 1;
More information about the wine-cvs
mailing list