Module: wine Branch: master Commit: 2ac74fa511be59b2eee79a8d47e48356fe842aca URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ac74fa511be59b2eee79a8d47...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Tue Nov 17 09:43:16 2009 +0100
d3d8: Make convert_to_wined3d_declaration() static.
---
dlls/d3d8/d3d8_private.h | 2 -- dlls/d3d8/vertexdeclaration.c | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 141aa92..f6ceeed 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -618,8 +618,6 @@ HRESULT pixelshader_init(IDirect3DPixelShader8Impl *shader, IDirect3DDevice8Impl D3DFORMAT d3dformat_from_wined3dformat(WINED3DFORMAT format) DECLSPEC_HIDDEN; WINED3DFORMAT wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN; void load_local_constants(const DWORD *d3d8_elements, IWineD3DVertexShader *wined3d_vertex_shader) DECLSPEC_HIDDEN; -UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elements_size, - WINED3DVERTEXELEMENT **wined3d_elements) DECLSPEC_HIDDEN; size_t parse_token(const DWORD *pToken) DECLSPEC_HIDDEN;
#endif /* __WINE_D3DX8_PRIVATE_H */ diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index bcc9991..b876b66 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -301,7 +301,8 @@ static const wined3d_usage_t wined3d_usage_lookup[] = { };
/* TODO: find out where rhw (or positionT) is for declaration8 */ -UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elements_size, WINED3DVERTEXELEMENT **wined3d_elements) +static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elements_size, + WINED3DVERTEXELEMENT **wined3d_elements) { const DWORD *token = d3d8_elements; WINED3DVERTEXELEMENT *element;