Module: wine Branch: master Commit: b0da585aeb89695dd619603d67a5aa3183e3c306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0da585aeb89695dd619603d67...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Fri Mar 13 09:49:24 2015 +0100
d3d10core: Implement d3d10_shader_resource_view_SetPrivateData().
---
dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/view.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 3678a45..5d02cca 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -171,6 +171,7 @@ struct d3d10_shader_resource_view ID3D10ShaderResourceView ID3D10ShaderResourceView_iface; LONG refcount;
+ struct wined3d_private_store private_store; struct wined3d_shader_resource_view *wined3d_view; D3D10_SHADER_RESOURCE_VIEW_DESC desc; ID3D10Resource *resource; diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 3576e4a..1a1c3d2 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -913,6 +913,7 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_Release(ID3D10ShaderRe wined3d_shader_resource_view_decref(This->wined3d_view); ID3D10Resource_Release(This->resource); ID3D10Device1_Release(This->device); + wined3d_private_store_cleanup(&This->private_store); HeapFree(GetProcessHeap(), 0, This); }
@@ -944,10 +945,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_GetPrivateData(ID3D1 static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateData(ID3D10ShaderResourceView *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data);
- return E_NOTIMPL; + return d3d10_set_private_data(&view->private_store, guid, data_size, data); }
static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateDataInterface(ID3D10ShaderResourceView *iface, @@ -1032,6 +1035,7 @@ HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, return hr; }
+ wined3d_private_store_init(&view->private_store); view->resource = resource; ID3D10Resource_AddRef(resource); view->device = &device->ID3D10Device1_iface;