Commit 329fb2f7 authored by Gediminas Jakutis's avatar Gediminas Jakutis Committed by Alexandre Julliard

d3dx9: Add adjacency generation for D3DXCreateCylinder().

parent 7626728b
...@@ -4986,12 +4986,6 @@ HRESULT WINAPI D3DXCreateCylinder(struct IDirect3DDevice9 *device, float radius1 ...@@ -4986,12 +4986,6 @@ HRESULT WINAPI D3DXCreateCylinder(struct IDirect3DDevice9 *device, float radius1
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
} }
if (adjacency)
{
FIXME("Case of adjacency != NULL not implemented.\n");
return E_NOTIMPL;
}
number_of_vertices = 2 + (slices * (3 + stacks)); number_of_vertices = 2 + (slices * (3 + stacks));
number_of_faces = 2 * slices + stacks * (2 * slices); number_of_faces = 2 * slices + stacks * (2 * slices);
...@@ -5143,6 +5137,23 @@ HRESULT WINAPI D3DXCreateCylinder(struct IDirect3DDevice9 *device, float radius1 ...@@ -5143,6 +5137,23 @@ HRESULT WINAPI D3DXCreateCylinder(struct IDirect3DDevice9 *device, float radius1
free_sincos_table(&theta); free_sincos_table(&theta);
cylinder->lpVtbl->UnlockIndexBuffer(cylinder); cylinder->lpVtbl->UnlockIndexBuffer(cylinder);
cylinder->lpVtbl->UnlockVertexBuffer(cylinder); cylinder->lpVtbl->UnlockVertexBuffer(cylinder);
if (adjacency)
{
if (FAILED(hr = D3DXCreateBuffer(number_of_faces * sizeof(DWORD) * 3, adjacency)))
{
cylinder->lpVtbl->Release(cylinder);
return hr;
}
if (FAILED(hr = cylinder->lpVtbl->GenerateAdjacency(cylinder, 0.0f, (*adjacency)->lpVtbl->GetBufferPointer(*adjacency))))
{
(*adjacency)->lpVtbl->Release(*adjacency);
cylinder->lpVtbl->Release(cylinder);
return hr;
}
}
*mesh = cylinder; *mesh = cylinder;
return D3D_OK; return D3D_OK;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment