From 2ffa29d66082808d20d7427831f620ec3a36d4fb Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Wed, 25 Feb 2015 09:34:08 +0100 Subject: [PATCH] d3d10core: Implement d3d10_input_layout_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/inputlayout.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 5544dc775e0..e03a5cb9acb 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -185,6 +185,7 @@ struct d3d10_input_layout ID3D10InputLayout ID3D10InputLayout_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_vertex_declaration *wined3d_decl; }; diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index 8350875a342..79ebea35656 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -174,10 +174,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_input_layout_GetPrivateData(ID3D10InputLa static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateData(ID3D10InputLayout *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_input_layout *layout = impl_from_ID3D10InputLayout(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(&layout->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateDataInterface(ID3D10InputLayout *iface, @@ -203,6 +205,9 @@ static const struct ID3D10InputLayoutVtbl d3d10_input_layout_vtbl = static void STDMETHODCALLTYPE d3d10_input_layout_wined3d_object_destroyed(void *parent) { + struct d3d10_input_layout *layout = parent; + + wined3d_private_store_cleanup(&layout->private_store); HeapFree(GetProcessHeap(), 0, parent); } @@ -221,12 +226,14 @@ HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d10_ layout->ID3D10InputLayout_iface.lpVtbl = &d3d10_input_layout_vtbl; layout->refcount = 1; + wined3d_private_store_init(&layout->private_store); hr = d3d10_input_layout_to_wined3d_declaration(element_descs, element_count, shader_byte_code, shader_byte_code_length, &wined3d_elements, &wined3d_element_count); if (FAILED(hr)) { WARN("Failed to create wined3d vertex declaration elements, hr %#x.\n", hr); + wined3d_private_store_cleanup(&layout->private_store); return hr; } @@ -236,6 +243,7 @@ HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d10_ if (FAILED(hr)) { WARN("Failed to create wined3d vertex declaration, hr %#x.\n", hr); + wined3d_private_store_cleanup(&layout->private_store); return hr; }