[PATCH 5/5] d3d11: Add ID3D11Texture2D stub interface.
Józef Kucia
jkucia at codeweavers.com
Sun Aug 23 18:04:28 CDT 2015
---
dlls/d3d11/d3d11_private.h | 1 +
dlls/d3d11/texture.c | 189 ++++++++++++++++++++++++++++++++++++++-------
2 files changed, 163 insertions(+), 27 deletions(-)
diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h
index f7f6729..2bef795 100644
--- a/dlls/d3d11/d3d11_private.h
+++ b/dlls/d3d11/d3d11_private.h
@@ -89,6 +89,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size,
struct d3d10_texture2d
{
ID3D10Texture2D ID3D10Texture2D_iface;
+ ID3D11Texture2D ID3D11Texture2D_iface;
LONG refcount;
struct wined3d_private_store private_store;
diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c
index 9cdbc7d..f1dcb35 100644
--- a/dlls/d3d11/texture.c
+++ b/dlls/d3d11/texture.c
@@ -29,28 +29,30 @@ static inline struct d3d10_texture2d *impl_from_ID3D10Texture2D(ID3D10Texture2D
return CONTAINING_RECORD(iface, struct d3d10_texture2d, ID3D10Texture2D_iface);
}
-/* IUnknown methods */
-
-static HRESULT STDMETHODCALLTYPE d3d10_texture2d_QueryInterface(ID3D10Texture2D *iface, REFIID riid, void **object)
+static HRESULT texture2d_query_interface(struct d3d10_texture2d *texture, REFIID riid, void **object)
{
- struct d3d10_texture2d *This = impl_from_ID3D10Texture2D(iface);
-
- TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object);
-
if (IsEqualGUID(riid, &IID_ID3D10Texture2D)
|| IsEqualGUID(riid, &IID_ID3D10Resource)
|| IsEqualGUID(riid, &IID_ID3D10DeviceChild)
|| IsEqualGUID(riid, &IID_IUnknown))
{
- IUnknown_AddRef(iface);
- *object = iface;
+ *object = &texture->ID3D10Texture2D_iface;
+ IUnknown_AddRef((IUnknown *)*object);
+ return S_OK;
+ }
+ else if (IsEqualGUID(riid, &IID_ID3D11Texture2D)
+ || IsEqualGUID(riid, &IID_ID3D11Resource)
+ || IsEqualGUID(riid, &IID_ID3D11DeviceChild))
+ {
+ *object = &texture->ID3D11Texture2D_iface;
+ IUnknown_AddRef((IUnknown *)*object);
return S_OK;
}
- if (This->dxgi_surface)
+ if (texture->dxgi_surface)
{
TRACE("Forwarding to dxgi surface\n");
- return IUnknown_QueryInterface(This->dxgi_surface, riid, object);
+ return IUnknown_QueryInterface(texture->dxgi_surface, riid, object);
}
WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid));
@@ -59,6 +61,37 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_QueryInterface(ID3D10Texture2D
return E_NOINTERFACE;
}
+static void texture2d_incref(struct d3d10_texture2d *texture)
+{
+ ID3D10Device1_AddRef(texture->device);
+ wined3d_mutex_lock();
+ wined3d_texture_incref(texture->wined3d_texture);
+ wined3d_mutex_unlock();
+}
+
+static void texture2d_destroy(struct d3d10_texture2d *texture)
+{
+ ID3D10Device1 *device = texture->device;
+
+ wined3d_mutex_lock();
+ wined3d_texture_decref(texture->wined3d_texture);
+ wined3d_mutex_unlock();
+ /* Release the device last, it may cause the wined3d device to be
+ * destroyed. */
+ ID3D10Device1_Release(device);
+}
+
+/* IUnknown methods */
+
+static HRESULT STDMETHODCALLTYPE d3d10_texture2d_QueryInterface(ID3D10Texture2D *iface, REFIID riid, void **object)
+{
+ struct d3d10_texture2d *This = impl_from_ID3D10Texture2D(iface);
+
+ TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object);
+
+ return texture2d_query_interface(This, riid, object);
+}
+
static ULONG STDMETHODCALLTYPE d3d10_texture2d_AddRef(ID3D10Texture2D *iface)
{
struct d3d10_texture2d *This = impl_from_ID3D10Texture2D(iface);
@@ -67,12 +100,7 @@ static ULONG STDMETHODCALLTYPE d3d10_texture2d_AddRef(ID3D10Texture2D *iface)
TRACE("%p increasing refcount to %u\n", This, refcount);
if (refcount == 1)
- {
- ID3D10Device1_AddRef(This->device);
- wined3d_mutex_lock();
- wined3d_texture_incref(This->wined3d_texture);
- wined3d_mutex_unlock();
- }
+ texture2d_incref(This);
return refcount;
}
@@ -94,16 +122,7 @@ static ULONG STDMETHODCALLTYPE d3d10_texture2d_Release(ID3D10Texture2D *iface)
TRACE("%p decreasing refcount to %u\n", This, refcount);
if (!refcount)
- {
- ID3D10Device1 *device = This->device;
-
- wined3d_mutex_lock();
- wined3d_texture_decref(This->wined3d_texture);
- wined3d_mutex_unlock();
- /* Release the device last, it may cause the wined3d device to be
- * destroyed. */
- ID3D10Device1_Release(device);
- }
+ texture2d_destroy(This);
return refcount;
}
@@ -305,6 +324,121 @@ struct d3d10_texture2d *unsafe_impl_from_ID3D10Texture2D(ID3D10Texture2D *iface)
return CONTAINING_RECORD(iface, struct d3d10_texture2d, ID3D10Texture2D_iface);
}
+/* ID3D11Texture2D methods */
+
+static inline struct d3d10_texture2d *impl_from_ID3D11Texture2D(ID3D11Texture2D *iface)
+{
+ return CONTAINING_RECORD(iface, struct d3d10_texture2d, ID3D11Texture2D_iface);
+}
+
+HRESULT STDMETHODCALLTYPE d3d11_texture2d_QueryInterface(ID3D11Texture2D *iface, REFIID riid, void **object)
+{
+ struct d3d10_texture2d *texture = impl_from_ID3D11Texture2D(iface);
+
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
+
+ return texture2d_query_interface(texture, riid, object);
+}
+
+ULONG STDMETHODCALLTYPE d3d11_texture2d_AddRef(ID3D11Texture2D *iface)
+{
+ struct d3d10_texture2d *texture = impl_from_ID3D11Texture2D(iface);
+ ULONG refcount = InterlockedIncrement(&texture->refcount);
+
+ TRACE("%p increasing refcount to %u.\n", texture, refcount);
+
+ if (refcount == 1)
+ texture2d_incref(texture);
+
+ return refcount;
+}
+
+ULONG STDMETHODCALLTYPE d3d11_texture2d_Release(ID3D11Texture2D *iface)
+{
+ struct d3d10_texture2d *texture = impl_from_ID3D11Texture2D(iface);
+ ULONG refcount = InterlockedDecrement(&texture->refcount);
+
+ TRACE("%p decreasing refcount to %u.\n", texture, refcount);
+
+ if (!refcount)
+ texture2d_destroy(texture);
+
+ return refcount;
+}
+
+void STDMETHODCALLTYPE d3d11_texture2d_GetDevice(ID3D11Texture2D *iface, ID3D11Device **device)
+{
+ FIXME("iface %p, device %p stub!\n", iface, device);
+}
+
+HRESULT STDMETHODCALLTYPE d3d11_texture2d_GetPrivateData(ID3D11Texture2D *iface,
+ REFGUID guid, UINT *data_size, void *data)
+{
+ FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data);
+
+ return E_NOTIMPL;
+}
+
+HRESULT STDMETHODCALLTYPE d3d11_texture2d_SetPrivateData(ID3D11Texture2D *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;
+}
+
+HRESULT STDMETHODCALLTYPE d3d11_texture2d_SetPrivateDataInterface(ID3D11Texture2D *iface,
+ REFGUID guid, const IUnknown *data)
+{
+ FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data);
+
+ return E_NOTIMPL;
+}
+
+void STDMETHODCALLTYPE d3d11_texture2d_GetType(ID3D11Texture2D *iface,
+ D3D11_RESOURCE_DIMENSION *resource_dimension)
+{
+ TRACE("iface %p, resource_dimension %p.\n", iface, resource_dimension);
+
+ *resource_dimension = D3D11_RESOURCE_DIMENSION_TEXTURE2D;
+}
+
+void STDMETHODCALLTYPE d3d11_texture2d_SetEvictionPriority(ID3D11Texture2D *iface, UINT eviction_priority)
+{
+ FIXME("iface %p, eviction_priority %#x stub!\n", iface, eviction_priority);
+}
+
+UINT STDMETHODCALLTYPE d3d11_texture2d_GetEvictionPriority(ID3D11Texture2D *iface)
+{
+ FIXME("iface %p stub!\n", iface);
+
+ return 0;
+}
+
+void STDMETHODCALLTYPE d3d11_texture2d_GetDesc(ID3D11Texture2D *iface, D3D11_TEXTURE2D_DESC *desc)
+{
+ FIXME("iface %p, desc %p stub!\n", iface, desc);
+}
+
+static const struct ID3D11Texture2DVtbl d3d11_texture2d_vtbl =
+{
+ /* IUnknown methods */
+ d3d11_texture2d_QueryInterface,
+ d3d11_texture2d_AddRef,
+ d3d11_texture2d_Release,
+ /* ID3D11DeviceChild methods */
+ d3d11_texture2d_GetDevice,
+ d3d11_texture2d_GetPrivateData,
+ d3d11_texture2d_SetPrivateData,
+ d3d11_texture2d_SetPrivateDataInterface,
+ /* ID3D11Resource methods */
+ d3d11_texture2d_GetType,
+ d3d11_texture2d_SetEvictionPriority,
+ d3d11_texture2d_GetEvictionPriority,
+ /* ID3D11Texture2D methods */
+ d3d11_texture2d_GetDesc,
+};
+
static const struct wined3d_parent_ops d3d10_texture2d_wined3d_parent_ops =
{
d3d10_texture2d_wined3d_object_released,
@@ -318,6 +452,7 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d_device
HRESULT hr;
texture->ID3D10Texture2D_iface.lpVtbl = &d3d10_texture2d_vtbl;
+ texture->ID3D11Texture2D_iface.lpVtbl = &d3d11_texture2d_vtbl;
texture->refcount = 1;
wined3d_mutex_lock();
wined3d_private_store_init(&texture->private_store);
--
2.4.6
More information about the wine-patches
mailing list