From 450a3fbfc20e4cca99e75425d1d4cd0dd48a927b Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Thu, 26 Feb 2015 10:11:34 +0100 Subject: [PATCH] d3d10core: Implement d3d10_geometry_shader_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/shader.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index dfd61495f22..8526cf2e93a 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -215,6 +215,7 @@ struct d3d10_geometry_shader ID3D10GeometryShader ID3D10GeometryShader_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_shader *wined3d_shader; }; diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 8010828a61a..d1d67bd08f6 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -377,10 +377,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_GetPrivateData(ID3D10Geom static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateData(ID3D10GeometryShader *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_geometry_shader *shader = impl_from_ID3D10GeometryShader(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(&shader->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateDataInterface(ID3D10GeometryShader *iface, @@ -406,6 +408,9 @@ static const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl = static void STDMETHODCALLTYPE d3d10_geometry_shader_wined3d_object_destroyed(void *parent) { + struct d3d10_geometry_shader *shader = parent; + + wined3d_private_store_cleanup(&shader->private_store); HeapFree(GetProcessHeap(), 0, parent); } @@ -425,12 +430,14 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct shader->ID3D10GeometryShader_iface.lpVtbl = &d3d10_geometry_shader_vtbl; shader->refcount = 1; + wined3d_private_store_init(&shader->private_store); shader_info.input_signature = &input_signature; shader_info.output_signature = &output_signature; if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info))) { ERR("Failed to extract shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); return hr; } @@ -446,6 +453,7 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct if (FAILED(hr)) { WARN("Failed to create wined3d geometry shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); return E_INVALIDARG; }