system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 04:34:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

d3dx9: Implement D3DXFrameDestroy.

Browse source
This commit is contained in:
Dylan Smith 2011-05-19 04:02:29 -04:00 committed by Alexandre Julliard
parent f51668fdf9
commit c3201a4678
2 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/d3dx9_36/d3dx9_36.spec
View file

@ -134,7 +134,7 @@
@ stub D3DXFloat32To16Array(ptr ptr long)
@ stub D3DXFrameAppendChild(ptr ptr)
@ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
@ stub D3DXFrameDestroy(ptr ptr)
@ stdcall D3DXFrameDestroy(ptr ptr)
@ stub D3DXFrameFind(ptr ptr)
@ stub D3DXFrameNumNamedMatrices(ptr)
@ stub D3DXFrameRegisterNamedMatrices(ptr ptr)

43
dlls/d3dx9_36/mesh.c
View file

@ -1808,6 +1808,49 @@ HRESULT WINAPI D3DXCreateMeshFVF(DWORD numfaces, DWORD numvertices, DWORD option
return D3DXCreateMesh(numfaces, numvertices, options, declaration, device, mesh);
}
HRESULT WINAPI D3DXFrameDestroy(LPD3DXFRAME frame, LPD3DXALLOCATEHIERARCHY alloc_hier)
{
HRESULT hr;
BOOL last = FALSE;
TRACE("(%p, %p)\n", frame, alloc_hier);
if (!frame || !alloc_hier)
return D3DERR_INVALIDCALL;
while (!last) {
D3DXMESHCONTAINER *container;
D3DXFRAME *current_frame;
if (frame->pFrameSibling) {
current_frame = frame->pFrameSibling;
frame->pFrameSibling = current_frame->pFrameSibling;
current_frame->pFrameSibling = NULL;
} else if (frame) {
current_frame = frame;
last = TRUE;
}
if (current_frame->pFrameFirstChild) {
hr = D3DXFrameDestroy(current_frame->pFrameFirstChild, alloc_hier);
if (FAILED(hr)) return hr;
current_frame->pFrameFirstChild = NULL;
}
container = current_frame->pMeshContainer;
while (container) {
D3DXMESHCONTAINER *next_container = container->pNextMeshContainer;
hr = alloc_hier->lpVtbl->DestroyMeshContainer(alloc_hier, container);
if (FAILED(hr)) return hr;
container = next_container;
}
hr = alloc_hier->lpVtbl->DestroyFrame(alloc_hier, current_frame);
if (FAILED(hr)) return hr;
}
return D3D_OK;
}
HRESULT WINAPI D3DXCreateBox(LPDIRECT3DDEVICE9 device, FLOAT width, FLOAT height,
FLOAT depth, LPD3DXMESH* mesh, LPD3DXBUFFER* adjacency)
{