[PATCH 2/7] d3d11: Add ID3D11ShaderResourceView interface stub.
Józef Kucia
jkucia at codeweavers.com
Wed Sep 9 17:55:43 CDT 2015
---
dlls/d3d11/d3d11_private.h | 3 +-
dlls/d3d11/view.c | 158 ++++++++++++++++++++++++++++++++++++++-------
2 files changed, 138 insertions(+), 23 deletions(-)
diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h
index 0abd374..b5d0b72 100644
--- a/dlls/d3d11/d3d11_private.h
+++ b/dlls/d3d11/d3d11_private.h
@@ -188,9 +188,10 @@ HRESULT d3d_rendertarget_view_create(struct d3d_device *device, ID3D11Resource *
const D3D11_RENDER_TARGET_VIEW_DESC *desc, struct d3d_rendertarget_view **view) DECLSPEC_HIDDEN;
struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) DECLSPEC_HIDDEN;
-/* ID3D10ShaderResourceView */
+/* ID3D11ShaderResourceView, ID3D10ShaderResourceView */
struct d3d_shader_resource_view
{
+ ID3D11ShaderResourceView ID3D11ShaderResourceView_iface;
ID3D10ShaderResourceView ID3D10ShaderResourceView_iface;
LONG refcount;
diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c
index 968c27e..7410916 100644
--- a/dlls/d3d11/view.c
+++ b/dlls/d3d11/view.c
@@ -1178,65 +1178,178 @@ struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10Rend
return impl_from_ID3D10RenderTargetView(iface);
}
-static inline struct d3d_shader_resource_view *impl_from_ID3D10ShaderResourceView(ID3D10ShaderResourceView *iface)
+/* ID3D11ShaderResourceView methods */
+
+struct d3d_shader_resource_view *impl_from_ID3D11ShaderResourceView(ID3D11ShaderResourceView *iface)
{
- return CONTAINING_RECORD(iface, struct d3d_shader_resource_view, ID3D10ShaderResourceView_iface);
+ return CONTAINING_RECORD(iface, struct d3d_shader_resource_view, ID3D11ShaderResourceView_iface);
}
-/* IUnknown methods */
-
-static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_QueryInterface(ID3D10ShaderResourceView *iface,
+static HRESULT STDMETHODCALLTYPE d3d11_shader_resource_view_QueryInterface(ID3D11ShaderResourceView *iface,
REFIID riid, void **object)
{
+ struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface);
+
TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
- if (IsEqualGUID(riid, &IID_ID3D10ShaderResourceView)
- || IsEqualGUID(riid, &IID_ID3D10View)
- || IsEqualGUID(riid, &IID_ID3D10DeviceChild)
+ if (IsEqualGUID(riid, &IID_ID3D11ShaderResourceView)
+ || IsEqualGUID(riid, &IID_ID3D11View)
+ || IsEqualGUID(riid, &IID_ID3D11DeviceChild)
|| IsEqualGUID(riid, &IID_IUnknown))
{
- IUnknown_AddRef(iface);
+ ID3D11ShaderResourceView_AddRef(iface);
*object = iface;
return S_OK;
}
+ if (IsEqualGUID(riid, &IID_ID3D10ShaderResourceView)
+ || IsEqualGUID(riid, &IID_ID3D10View)
+ || IsEqualGUID(riid, &IID_ID3D10DeviceChild))
+ {
+ ID3D10ShaderResourceView_AddRef(&view->ID3D10ShaderResourceView_iface);
+ *object = &view->ID3D10ShaderResourceView_iface;
+ return S_OK;
+ }
+
WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
*object = NULL;
return E_NOINTERFACE;
}
-static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_AddRef(ID3D10ShaderResourceView *iface)
+static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_AddRef(ID3D11ShaderResourceView *iface)
{
- struct d3d_shader_resource_view *This = impl_from_ID3D10ShaderResourceView(iface);
- ULONG refcount = InterlockedIncrement(&This->refcount);
+ struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(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_shader_resource_view_Release(ID3D10ShaderResourceView *iface)
+static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_Release(ID3D11ShaderResourceView *iface)
{
- struct d3d_shader_resource_view *This = impl_from_ID3D10ShaderResourceView(iface);
- ULONG refcount = InterlockedDecrement(&This->refcount);
+ struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(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_shader_resource_view_decref(This->wined3d_view);
- ID3D10Resource_Release(This->resource);
- ID3D10Device1_Release(This->device);
- wined3d_private_store_cleanup(&This->private_store);
+ wined3d_shader_resource_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_shader_resource_view_GetDevice(ID3D11ShaderResourceView *iface,
+ ID3D11Device **device)
+{
+ FIXME("iface %p, device %p stub!\n", iface, device);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d11_shader_resource_view_GetPrivateData(ID3D11ShaderResourceView *iface,
+ REFGUID guid, UINT *data_size, void *data)
+{
+ struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(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_shader_resource_view_SetPrivateData(ID3D11ShaderResourceView *iface,
+ REFGUID guid, UINT data_size, const void *data)
+{
+ struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(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_shader_resource_view_SetPrivateDataInterface(ID3D11ShaderResourceView *iface,
+ REFGUID guid, const IUnknown *data)
+{
+ struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(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_shader_resource_view_GetResource(ID3D11ShaderResourceView *iface,
+ ID3D11Resource **resource)
+{
+ FIXME("iface %p, resource %p stub!\n", iface, resource);
+}
+
+static void STDMETHODCALLTYPE d3d11_shader_resource_view_GetDesc(ID3D11ShaderResourceView *iface,
+ D3D11_SHADER_RESOURCE_VIEW_DESC *desc)
+{
+ FIXME("iface %p, desc %p stub!\n", iface, desc);
+}
+
+static const struct ID3D11ShaderResourceViewVtbl d3d11_shader_resource_view_vtbl =
+{
+ /* IUnknown methods */
+ d3d11_shader_resource_view_QueryInterface,
+ d3d11_shader_resource_view_AddRef,
+ d3d11_shader_resource_view_Release,
+ /* ID3D11DeviceChild methods */
+ d3d11_shader_resource_view_GetDevice,
+ d3d11_shader_resource_view_GetPrivateData,
+ d3d11_shader_resource_view_SetPrivateData,
+ d3d11_shader_resource_view_SetPrivateDataInterface,
+ /* ID3D11View methods */
+ d3d11_shader_resource_view_GetResource,
+ /* ID3D11ShaderResourceView methods */
+ d3d11_shader_resource_view_GetDesc,
+};
+
+/* ID3D10ShaderResourceView methods */
+
+static inline struct d3d_shader_resource_view *impl_from_ID3D10ShaderResourceView(ID3D10ShaderResourceView *iface)
+{
+ return CONTAINING_RECORD(iface, struct d3d_shader_resource_view, ID3D10ShaderResourceView_iface);
+}
+
+/* IUnknown methods */
+
+static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_QueryInterface(ID3D10ShaderResourceView *iface,
+ REFIID riid, void **object)
+{
+ struct d3d_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface);
+
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
+
+ return d3d11_shader_resource_view_QueryInterface(&view->ID3D11ShaderResourceView_iface, riid, object);
+}
+
+static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_AddRef(ID3D10ShaderResourceView *iface)
+{
+ struct d3d_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return d3d11_shader_resource_view_AddRef(&view->ID3D11ShaderResourceView_iface);
+}
+
+static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_Release(ID3D10ShaderResourceView *iface)
+{
+ struct d3d_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface);
+
+ TRACE("iface %p.\n", iface);
+
+ return d3d11_shader_resource_view_Release(&view->ID3D11ShaderResourceView_iface);
+}
+
/* ID3D10DeviceChild methods */
static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDevice(ID3D10ShaderResourceView *iface,
@@ -1330,6 +1443,7 @@ HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, str
struct wined3d_resource *wined3d_resource;
HRESULT hr;
+ view->ID3D11ShaderResourceView_iface.lpVtbl = &d3d11_shader_resource_view_vtbl;
view->ID3D10ShaderResourceView_iface.lpVtbl = &d3d10_shader_resource_view_vtbl;
view->refcount = 1;
--
2.4.6
More information about the wine-patches
mailing list