From: Józef Kucia Subject: [PATCH 2/7] d3d11: Rename d3d10_{get, set}_private_data functions to d3d_{get, set}_private_data. Message-Id: <1441231615-10101-2-git-send-email-jkucia@codeweavers.com> Date: Thu, 3 Sep 2015 00:06:50 +0200 --- dlls/d3d11/async.c | 6 +++--- dlls/d3d11/buffer.c | 6 +++--- dlls/d3d11/d3d11_private.h | 6 +++--- dlls/d3d11/inputlayout.c | 6 +++--- dlls/d3d11/shader.c | 18 +++++++++--------- dlls/d3d11/state.c | 24 ++++++++++++------------ dlls/d3d11/texture.c | 12 ++++++------ dlls/d3d11/utils.c | 8 ++++---- dlls/d3d11/view.c | 18 +++++++++--------- 9 files changed, 52 insertions(+), 52 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index f8ab776..8983321 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -104,7 +104,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_GetPrivateData(ID3D10Query *iface, TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_get_private_data(&query->private_store, guid, data_size, data); + return d3d_get_private_data(&query->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateData(ID3D10Query *iface, @@ -115,7 +115,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateData(ID3D10Query *iface, TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_set_private_data(&query->private_store, guid, data_size, data); + return d3d_set_private_data(&query->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateDataInterface(ID3D10Query *iface, @@ -125,7 +125,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateDataInterface(ID3D10Query TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - return d3d10_set_private_data_interface(&query->private_store, guid, data); + return d3d_set_private_data_interface(&query->private_store, guid, data); } /* ID3D10Asynchronous methods */ diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 6ba1472..ae2358d 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -111,7 +111,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_GetPrivateData(ID3D10Buffer *iface TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_get_private_data(&buffer->private_store, guid, data_size, data); + return d3d_get_private_data(&buffer->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateData(ID3D10Buffer *iface, @@ -122,7 +122,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateData(ID3D10Buffer *iface TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_set_private_data(&buffer->private_store, guid, data_size, data); + return d3d_set_private_data(&buffer->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateDataInterface(ID3D10Buffer *iface, @@ -132,7 +132,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateDataInterface(ID3D10Buff TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - return d3d10_set_private_data_interface(&buffer->private_store, guid, data); + return d3d_set_private_data_interface(&buffer->private_store, guid, data); } /* ID3D10Resource methods */ diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index cbdfdfa..b99f432 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -76,11 +76,11 @@ UINT d3d10_cpu_access_flags_from_d3d11_cpu_access_flags(UINT cpu_access_flags) D UINT d3d11_resource_misc_flags_from_d3d10_resource_misc_flags(UINT resource_misc_flags) DECLSPEC_HIDDEN; UINT d3d10_resource_misc_flags_from_d3d11_resource_misc_flags(UINT resource_misc_flags) DECLSPEC_HIDDEN; -HRESULT d3d10_get_private_data(struct wined3d_private_store *store, +HRESULT d3d_get_private_data(struct wined3d_private_store *store, REFGUID guid, UINT *data_size, void *data) DECLSPEC_HIDDEN; -HRESULT d3d10_set_private_data(struct wined3d_private_store *store, +HRESULT d3d_set_private_data(struct wined3d_private_store *store, REFGUID guid, UINT data_size, const void *data) DECLSPEC_HIDDEN; -HRESULT d3d10_set_private_data_interface(struct wined3d_private_store *store, +HRESULT d3d_set_private_data_interface(struct wined3d_private_store *store, REFGUID guid, const IUnknown *object) DECLSPEC_HIDDEN; static inline void read_dword(const char **ptr, DWORD *d) diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 57098b6..edf7806 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -170,7 +170,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_input_layout_GetPrivateData(ID3D10InputLa TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_get_private_data(&layout->private_store, guid, data_size, data); + return d3d_get_private_data(&layout->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateData(ID3D10InputLayout *iface, @@ -181,7 +181,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateData(ID3D10InputLa TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_set_private_data(&layout->private_store, guid, data_size, data); + return d3d_set_private_data(&layout->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateDataInterface(ID3D10InputLayout *iface, @@ -191,7 +191,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateDataInterface(ID3D TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - return d3d10_set_private_data_interface(&layout->private_store, guid, data); + return d3d_set_private_data_interface(&layout->private_store, guid, data); } static const struct ID3D10InputLayoutVtbl d3d10_input_layout_vtbl = diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 29c7e49..bab6cbf 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -209,7 +209,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_GetPrivateData(ID3D10Vertex TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_get_private_data(&shader->private_store, guid, data_size, data); + return d3d_get_private_data(&shader->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateData(ID3D10VertexShader *iface, @@ -220,7 +220,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateData(ID3D10Vertex TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_set_private_data(&shader->private_store, guid, data_size, data); + return d3d_set_private_data(&shader->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateDataInterface(ID3D10VertexShader *iface, @@ -230,7 +230,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateDataInterface(ID3 TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - return d3d10_set_private_data_interface(&shader->private_store, guid, data); + return d3d_set_private_data_interface(&shader->private_store, guid, data); } static const struct ID3D10VertexShaderVtbl d3d10_vertex_shader_vtbl = @@ -385,7 +385,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_GetPrivateData(ID3D10Geom TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_get_private_data(&shader->private_store, guid, data_size, data); + return d3d_get_private_data(&shader->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateData(ID3D10GeometryShader *iface, @@ -396,7 +396,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateData(ID3D10Geom TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_set_private_data(&shader->private_store, guid, data_size, data); + return d3d_set_private_data(&shader->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateDataInterface(ID3D10GeometryShader *iface, @@ -406,7 +406,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateDataInterface(I TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - return d3d10_set_private_data_interface(&shader->private_store, guid, data); + return d3d_set_private_data_interface(&shader->private_store, guid, data); } static const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl = @@ -576,7 +576,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_GetPrivateData(ID3D10PixelSh TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_get_private_data(&shader->private_store, guid, data_size, data); + return d3d_get_private_data(&shader->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_SetPrivateData(ID3D10PixelShader *iface, @@ -587,7 +587,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_SetPrivateData(ID3D10PixelSh TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_set_private_data(&shader->private_store, guid, data_size, data); + return d3d_set_private_data(&shader->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_SetPrivateDataInterface(ID3D10PixelShader *iface, @@ -597,7 +597,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_SetPrivateDataInterface(ID3D TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - return d3d10_set_private_data_interface(&shader->private_store, guid, data); + return d3d_set_private_data_interface(&shader->private_store, guid, data); } static const struct ID3D10PixelShaderVtbl d3d10_pixel_shader_vtbl = diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 3579261..000e367 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -108,7 +108,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_GetPrivateData(ID3D10BlendSta TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_get_private_data(&state->private_store, guid, data_size, data); + return d3d_get_private_data(&state->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateData(ID3D10BlendState *iface, @@ -119,7 +119,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateData(ID3D10BlendSta TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_set_private_data(&state->private_store, guid, data_size, data); + return d3d_set_private_data(&state->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateDataInterface(ID3D10BlendState *iface, @@ -129,7 +129,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateDataInterface(ID3D1 TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - return d3d10_set_private_data_interface(&state->private_store, guid, data); + return d3d_set_private_data_interface(&state->private_store, guid, data); } /* ID3D10BlendState methods */ @@ -270,7 +270,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_GetPrivateData(ID3D10D TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_get_private_data(&state->private_store, guid, data_size, data); + return d3d_get_private_data(&state->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_SetPrivateData(ID3D10DepthStencilState *iface, @@ -281,7 +281,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_SetPrivateData(ID3D10D TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_set_private_data(&state->private_store, guid, data_size, data); + return d3d_set_private_data(&state->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_SetPrivateDataInterface(ID3D10DepthStencilState *iface, @@ -291,7 +291,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_SetPrivateDataInterfac TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - return d3d10_set_private_data_interface(&state->private_store, guid, data); + return d3d_set_private_data_interface(&state->private_store, guid, data); } /* ID3D10DepthStencilState methods */ @@ -432,7 +432,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_GetPrivateData(ID3D10Ras TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_get_private_data(&state->private_store, guid, data_size, data); + return d3d_get_private_data(&state->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateData(ID3D10RasterizerState *iface, @@ -443,7 +443,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateData(ID3D10Ras TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_set_private_data(&state->private_store, guid, data_size, data); + return d3d_set_private_data(&state->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateDataInterface(ID3D10RasterizerState *iface, @@ -453,7 +453,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateDataInterface( TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - return d3d10_set_private_data_interface(&state->private_store, guid, data); + return d3d_set_private_data_interface(&state->private_store, guid, data); } /* ID3D10RasterizerState methods */ @@ -596,7 +596,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_GetPrivateData(ID3D10Sample TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_get_private_data(&state->private_store, guid, data_size, data); + return d3d_get_private_data(&state->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_SetPrivateData(ID3D10SamplerState *iface, @@ -607,7 +607,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_SetPrivateData(ID3D10Sample TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_set_private_data(&state->private_store, guid, data_size, data); + return d3d_set_private_data(&state->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_SetPrivateDataInterface(ID3D10SamplerState *iface, @@ -617,7 +617,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_SetPrivateDataInterface(ID3 TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - return d3d10_set_private_data_interface(&state->private_store, guid, data); + return d3d_set_private_data_interface(&state->private_store, guid, data); } /* ID3D10SamplerState methods */ diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index db99a9b..aa4beaf 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -134,7 +134,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_texture2d_GetPrivateData(ID3D11Texture2D return hr; } - return d3d10_get_private_data(&texture->private_store, guid, data_size, data); + return d3d_get_private_data(&texture->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d11_texture2d_SetPrivateData(ID3D11Texture2D *iface, @@ -154,7 +154,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_texture2d_SetPrivateData(ID3D11Texture2D return hr; } - return d3d10_set_private_data(&texture->private_store, guid, data_size, data); + return d3d_set_private_data(&texture->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d11_texture2d_SetPrivateDataInterface(ID3D11Texture2D *iface, @@ -174,7 +174,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_texture2d_SetPrivateDataInterface(ID3D11T return hr; } - return d3d10_set_private_data_interface(&texture->private_store, guid, data); + return d3d_set_private_data_interface(&texture->private_store, guid, data); } static void STDMETHODCALLTYPE d3d11_texture2d_GetType(ID3D11Texture2D *iface, @@ -760,7 +760,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_GetPrivateData(ID3D10Texture3D TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_get_private_data(&texture->private_store, guid, data_size, data); + return d3d_get_private_data(&texture->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateData(ID3D10Texture3D *iface, @@ -771,7 +771,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateData(ID3D10Texture3D TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_set_private_data(&texture->private_store, guid, data_size, data); + return d3d_set_private_data(&texture->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateDataInterface(ID3D10Texture3D *iface, @@ -781,7 +781,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateDataInterface(ID3D10T TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - return d3d10_set_private_data_interface(&texture->private_store, guid, data); + return d3d_set_private_data_interface(&texture->private_store, guid, data); } static void STDMETHODCALLTYPE d3d10_texture3d_GetType(ID3D10Texture3D *iface, diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 3ad00da..8e89c32 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -553,7 +553,7 @@ DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) } } -HRESULT d3d10_get_private_data(struct wined3d_private_store *store, +HRESULT d3d_get_private_data(struct wined3d_private_store *store, REFGUID guid, UINT *data_size, void *data) { const struct wined3d_private_data *stored_data; @@ -591,7 +591,7 @@ HRESULT d3d10_get_private_data(struct wined3d_private_store *store, return S_OK; } -HRESULT d3d10_set_private_data(struct wined3d_private_store *store, +HRESULT d3d_set_private_data(struct wined3d_private_store *store, REFGUID guid, UINT data_size, const void *data) { struct wined3d_private_data *entry; @@ -617,13 +617,13 @@ HRESULT d3d10_set_private_data(struct wined3d_private_store *store, return hr; } -HRESULT d3d10_set_private_data_interface(struct wined3d_private_store *store, +HRESULT d3d_set_private_data_interface(struct wined3d_private_store *store, REFGUID guid, const IUnknown *object) { HRESULT hr; if (!object) - return d3d10_set_private_data(store, guid, sizeof(object), &object); + return d3d_set_private_data(store, guid, sizeof(object), &object); wined3d_mutex_lock(); hr = wined3d_private_store_set_private_data(store, diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 5ee9212..c6b0906 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -436,7 +436,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_GetPrivateData(ID3D10De TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_get_private_data(&view->private_store, guid, data_size, data); + return d3d_get_private_data(&view->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_SetPrivateData(ID3D10DepthStencilView *iface, @@ -447,7 +447,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_SetPrivateData(ID3D10De TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_set_private_data(&view->private_store, guid, data_size, data); + return d3d_set_private_data(&view->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_SetPrivateDataInterface(ID3D10DepthStencilView *iface, @@ -457,7 +457,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_SetPrivateDataInterface TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - return d3d10_set_private_data_interface(&view->private_store, guid, data); + return d3d_set_private_data_interface(&view->private_store, guid, data); } /* ID3D10View methods */ @@ -689,7 +689,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_GetPrivateData(ID3D10Re TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_get_private_data(&view->private_store, guid, data_size, data); + return d3d_get_private_data(&view->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateData(ID3D10RenderTargetView *iface, @@ -700,7 +700,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateData(ID3D10Re TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_set_private_data(&view->private_store, guid, data_size, data); + return d3d_set_private_data(&view->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateDataInterface(ID3D10RenderTargetView *iface, @@ -710,7 +710,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateDataInterface TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - return d3d10_set_private_data_interface(&view->private_store, guid, data); + return d3d_set_private_data_interface(&view->private_store, guid, data); } /* ID3D10View methods */ @@ -954,7 +954,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_GetPrivateData(ID3D1 TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_get_private_data(&view->private_store, guid, data_size, data); + return d3d_get_private_data(&view->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateData(ID3D10ShaderResourceView *iface, @@ -965,7 +965,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateData(ID3D1 TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d10_set_private_data(&view->private_store, guid, data_size, data); + return d3d_set_private_data(&view->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateDataInterface(ID3D10ShaderResourceView *iface, @@ -975,7 +975,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateDataInterf TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - return d3d10_set_private_data_interface(&view->private_store, guid, data); + return d3d_set_private_data_interface(&view->private_store, guid, data); } /* ID3D10View methods */ -- 2.4.6