From: Sebastian Lackner Subject: d3dx9_36: Fix d3dx9_skin_info_ConvertToIndexedBlendedMesh stub. Message-Id: <54F65762.9000802@fds-team.de> Date: Wed, 04 Mar 2015 01:52:50 +0100 From: Christian Costa --- dlls/d3dx9_36/skin.c | 6 +++--- include/d3dx9mesh.h | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) From 36b08cffe8ab417c878ac0c10251b261bace58cd Mon Sep 17 00:00:00 2001 From: Christian Costa Date: Wed, 31 Dec 2014 10:42:01 +0100 Subject: d3dx9_36: Fix d3dx9_skin_info_ConvertToIndexedBlendedMesh stub. --- dlls/d3dx9_36/skin.c | 6 +++--- include/d3dx9mesh.h | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c index aa5acf2..9b93af6 100644 --- a/dlls/d3dx9_36/skin.c +++ b/dlls/d3dx9_36/skin.c @@ -395,13 +395,13 @@ static HRESULT WINAPI d3dx9_skin_info_ConvertToBlendedMesh(ID3DXSkinInfo *iface, } static HRESULT WINAPI d3dx9_skin_info_ConvertToIndexedBlendedMesh(ID3DXSkinInfo *iface, ID3DXMesh *mesh_in, - DWORD options, const DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap, + DWORD options, DWORD palette_size, const DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap, ID3DXBuffer **vertex_remap, DWORD *max_face_infl, DWORD *num_bone_combinations, ID3DXBuffer **bone_combination_table, ID3DXMesh **mesh_out) { - FIXME("iface %p, mesh_in %p, options %#x, adjacency_in %p, adjacency_out %p, face_remap %p, vertex_remap %p, " + FIXME("iface %p, mesh_in %p, options %#x, palette_size %u, adjacency_in %p, adjacency_out %p, face_remap %p, vertex_remap %p, " "max_face_infl %p, num_bone_combinations %p, bone_combination_table %p, mesh_out %p stub!\n", - iface, mesh_in, options, adjacency_in, adjacency_out, face_remap, vertex_remap, + iface, mesh_in, options, palette_size, adjacency_in, adjacency_out, face_remap, vertex_remap, max_face_infl, num_bone_combinations, bone_combination_table, mesh_out); return E_NOTIMPL; diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 1dcc244..8777749 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -544,9 +544,10 @@ DECLARE_INTERFACE_(ID3DXSkinInfo, IUnknown) STDMETHOD(ConvertToBlendedMesh)(THIS_ ID3DXMesh *mesh_in, DWORD options, const DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap, ID3DXBuffer **vertex_remap, DWORD *max_face_infl, DWORD *num_bone_combinations, ID3DXBuffer **bone_combination_table, ID3DXMesh **mesh_out) PURE; - STDMETHOD(ConvertToIndexedBlendedMesh)(THIS_ ID3DXMesh *mesh_in, DWORD options, const DWORD *adjacency_in, - DWORD *adjacency_out, DWORD *face_remap, ID3DXBuffer **vertex_remap, DWORD *max_face_infl, - DWORD *num_bone_combinations, ID3DXBuffer **bone_combination_table, ID3DXMesh **mesh_out) PURE; + STDMETHOD(ConvertToIndexedBlendedMesh)(THIS_ ID3DXMesh *mesh_in, DWORD options, DWORD palette_size, + const DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap, ID3DXBuffer **vertex_remap, + DWORD *max_face_infl, DWORD *num_bone_combinations, ID3DXBuffer **bone_combination_table, + ID3DXMesh **mesh_out) PURE; }; #undef INTERFACE -- 2.2.1