Module: wine Branch: master Commit: 2a17794ffadda78a5a968eabfb76545607d3af82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a17794ffadda78a5a968eabfb...
Author: Józef Kucia jkucia@codeweavers.com Date: Tue Sep 15 01:37:42 2015 +0200
d3d11: Rename d3d10_input_layout to d3d_input_layout.
---
dlls/d3d11/d3d11_private.h | 6 +++--- dlls/d3d11/device.c | 8 ++++---- dlls/d3d11/inputlayout.c | 30 ++++++++++++++++-------------- 3 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index e48befd..b8f8977 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -208,7 +208,7 @@ struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView( ID3D10ShaderResourceView *iface) DECLSPEC_HIDDEN;
/* ID3D10InputLayout */ -struct d3d10_input_layout +struct d3d_input_layout { ID3D10InputLayout ID3D10InputLayout_iface; LONG refcount; @@ -217,10 +217,10 @@ struct d3d10_input_layout struct wined3d_vertex_declaration *wined3d_decl; };
-HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d_device *device, +HRESULT d3d_input_layout_init(struct d3d_input_layout *layout, struct d3d_device *device, const D3D10_INPUT_ELEMENT_DESC *element_descs, UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length) DECLSPEC_HIDDEN; -struct d3d10_input_layout *unsafe_impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) DECLSPEC_HIDDEN; +struct d3d_input_layout *unsafe_impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) DECLSPEC_HIDDEN;
/* ID3D10VertexShader */ struct d3d10_vertex_shader diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e632677..d0468e2 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -728,7 +728,7 @@ static void STDMETHODCALLTYPE d3d10_device_IASetInputLayout(ID3D10Device1 *iface ID3D10InputLayout *input_layout) { struct d3d_device *This = impl_from_ID3D10Device(iface); - struct d3d10_input_layout *layout = unsafe_impl_from_ID3D10InputLayout(input_layout); + struct d3d_input_layout *layout = unsafe_impl_from_ID3D10InputLayout(input_layout);
TRACE("iface %p, input_layout %p\n", iface, input_layout);
@@ -1426,7 +1426,7 @@ static void STDMETHODCALLTYPE d3d10_device_IAGetInputLayout(ID3D10Device1 *iface { struct d3d_device *device = impl_from_ID3D10Device(iface); struct wined3d_vertex_declaration *wined3d_declaration; - struct d3d10_input_layout *input_layout_impl; + struct d3d_input_layout *input_layout_impl;
TRACE("iface %p, input_layout %p.\n", iface, input_layout);
@@ -2207,7 +2207,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device1 *i ID3D10InputLayout **input_layout) { struct d3d_device *This = impl_from_ID3D10Device(iface); - struct d3d10_input_layout *object; + struct d3d_input_layout *object; HRESULT hr;
TRACE("iface %p, element_descs %p, element_count %u, shader_byte_code %p, " @@ -2219,7 +2219,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device1 *i if (!object) return E_OUTOFMEMORY;
- hr = d3d10_input_layout_init(object, This, element_descs, element_count, + hr = d3d_input_layout_init(object, This, element_descs, element_count, shader_byte_code, shader_byte_code_length); if (FAILED(hr)) { diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index edf7806..3d3b17f 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -94,9 +94,11 @@ static HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEME return S_OK; }
-static inline struct d3d10_input_layout *impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) +/* ID3D10InputLayout methods */ + +static inline struct d3d_input_layout *impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) { - return CONTAINING_RECORD(iface, struct d3d10_input_layout, ID3D10InputLayout_iface); + return CONTAINING_RECORD(iface, struct d3d_input_layout, ID3D10InputLayout_iface); }
/* IUnknown methods */ @@ -123,7 +125,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_input_layout_QueryInterface(ID3D10InputLa
static ULONG STDMETHODCALLTYPE d3d10_input_layout_AddRef(ID3D10InputLayout *iface) { - struct d3d10_input_layout *This = impl_from_ID3D10InputLayout(iface); + struct d3d_input_layout *This = impl_from_ID3D10InputLayout(iface); ULONG refcount = InterlockedIncrement(&This->refcount);
TRACE("%p increasing refcount to %u\n", This, refcount); @@ -140,7 +142,7 @@ static ULONG STDMETHODCALLTYPE d3d10_input_layout_AddRef(ID3D10InputLayout *ifac
static ULONG STDMETHODCALLTYPE d3d10_input_layout_Release(ID3D10InputLayout *iface) { - struct d3d10_input_layout *This = impl_from_ID3D10InputLayout(iface); + struct d3d_input_layout *This = impl_from_ID3D10InputLayout(iface); ULONG refcount = InterlockedDecrement(&This->refcount);
TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -165,7 +167,7 @@ static void STDMETHODCALLTYPE d3d10_input_layout_GetDevice(ID3D10InputLayout *if static HRESULT STDMETHODCALLTYPE d3d10_input_layout_GetPrivateData(ID3D10InputLayout *iface, REFGUID guid, UINT *data_size, void *data) { - struct d3d10_input_layout *layout = impl_from_ID3D10InputLayout(iface); + struct d3d_input_layout *layout = impl_from_ID3D10InputLayout(iface);
TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -176,7 +178,7 @@ 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) { - struct d3d10_input_layout *layout = impl_from_ID3D10InputLayout(iface); + struct d3d_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); @@ -187,7 +189,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateData(ID3D10InputLa static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateDataInterface(ID3D10InputLayout *iface, REFGUID guid, const IUnknown *data) { - struct d3d10_input_layout *layout = impl_from_ID3D10InputLayout(iface); + struct d3d_input_layout *layout = impl_from_ID3D10InputLayout(iface);
TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data);
@@ -207,20 +209,20 @@ static const struct ID3D10InputLayoutVtbl d3d10_input_layout_vtbl = d3d10_input_layout_SetPrivateDataInterface, };
-static void STDMETHODCALLTYPE d3d10_input_layout_wined3d_object_destroyed(void *parent) +static void STDMETHODCALLTYPE d3d_input_layout_wined3d_object_destroyed(void *parent) { - struct d3d10_input_layout *layout = parent; + struct d3d_input_layout *layout = parent;
wined3d_private_store_cleanup(&layout->private_store); HeapFree(GetProcessHeap(), 0, parent); }
-static const struct wined3d_parent_ops d3d10_input_layout_wined3d_parent_ops = +static const struct wined3d_parent_ops d3d_input_layout_wined3d_parent_ops = { - d3d10_input_layout_wined3d_object_destroyed, + d3d_input_layout_wined3d_object_destroyed, };
-HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d_device *device, +HRESULT d3d_input_layout_init(struct d3d_input_layout *layout, struct d3d_device *device, const D3D10_INPUT_ELEMENT_DESC *element_descs, UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length) { @@ -242,7 +244,7 @@ HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d_de }
hr = wined3d_vertex_declaration_create(device->wined3d_device, wined3d_elements, element_count, - layout, &d3d10_input_layout_wined3d_parent_ops, &layout->wined3d_decl); + layout, &d3d_input_layout_wined3d_parent_ops, &layout->wined3d_decl); HeapFree(GetProcessHeap(), 0, wined3d_elements); if (FAILED(hr)) { @@ -256,7 +258,7 @@ HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d_de return S_OK; }
-struct d3d10_input_layout *unsafe_impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) +struct d3d_input_layout *unsafe_impl_from_ID3D10InputLayout(ID3D10InputLayout *iface) { if (!iface) return NULL;