ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Rename IWineD3DDevice::GetIndices() to IWineD3DDevice::GetIndexBuffer().

This commit is contained in:
Henri Verbeet 2009-09-25 13:31:46 +02:00 committed by Alexandre Julliard
parent 60e32659a7
commit c64da00de7
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3d8/device.c
View File

@ -2082,7 +2082,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetIndices(LPDIRECT3DDEVICE8 iface, I
/* The case from UINT to INT is safe because d3d8 will never set negative values */ /* The case from UINT to INT is safe because d3d8 will never set negative values */
wined3d_mutex_lock(); wined3d_mutex_lock();
IWineD3DDevice_GetBaseVertexIndex(This->WineD3DDevice, (INT *) pBaseVertexIndex); IWineD3DDevice_GetBaseVertexIndex(This->WineD3DDevice, (INT *) pBaseVertexIndex);
rc = IWineD3DDevice_GetIndices(This->WineD3DDevice, &retIndexData); rc = IWineD3DDevice_GetIndexBuffer(This->WineD3DDevice, &retIndexData);
if (SUCCEEDED(rc) && retIndexData) { if (SUCCEEDED(rc) && retIndexData) {
IWineD3DBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData); IWineD3DBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData);
IWineD3DBuffer_Release(retIndexData); IWineD3DBuffer_Release(retIndexData);

2
dlls/d3d9/device.c
View File

@ -1954,7 +1954,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetIndices(LPDIRECT3DDEVICE9EX ifac
} }
wined3d_mutex_lock(); wined3d_mutex_lock();
rc = IWineD3DDevice_GetIndices(This->WineD3DDevice, &retIndexData); rc = IWineD3DDevice_GetIndexBuffer(This->WineD3DDevice, &retIndexData);
if (SUCCEEDED(rc) && retIndexData) { if (SUCCEEDED(rc) && retIndexData) {
IWineD3DBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData); IWineD3DBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData);
IWineD3DBuffer_Release(retIndexData); IWineD3DBuffer_Release(retIndexData);

5
dlls/wined3d/device.c
View File

@ -3100,7 +3100,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetIndexBuffer(IWineD3DDevice *iface,
return WINED3D_OK; return WINED3D_OK;
} }
static HRESULT WINAPI IWineD3DDeviceImpl_GetIndices(IWineD3DDevice *iface, IWineD3DBuffer** ppIndexData) { static HRESULT WINAPI IWineD3DDeviceImpl_GetIndexBuffer(IWineD3DDevice *iface, IWineD3DBuffer **ppIndexData)
{
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
*ppIndexData = This->stateBlock->pIndexData; *ppIndexData = This->stateBlock->pIndexData;
@ -7396,7 +7397,7 @@ const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl =
IWineD3DDeviceImpl_SetGammaRamp, IWineD3DDeviceImpl_SetGammaRamp,
IWineD3DDeviceImpl_GetGammaRamp, IWineD3DDeviceImpl_GetGammaRamp,
IWineD3DDeviceImpl_SetIndexBuffer, IWineD3DDeviceImpl_SetIndexBuffer,
IWineD3DDeviceImpl_GetIndices, IWineD3DDeviceImpl_GetIndexBuffer,
IWineD3DDeviceImpl_SetBaseVertexIndex, IWineD3DDeviceImpl_SetBaseVertexIndex,
IWineD3DDeviceImpl_GetBaseVertexIndex, IWineD3DDeviceImpl_GetBaseVertexIndex,
IWineD3DDeviceImpl_SetLight, IWineD3DDeviceImpl_SetLight,

2
include/wine/wined3d.idl
View File

@ -3122,7 +3122,7 @@ interface IWineD3DDevice : IWineD3DBase
[in] IWineD3DBuffer *index_buffer, [in] IWineD3DBuffer *index_buffer,
[in] WINED3DFORMAT format [in] WINED3DFORMAT format
); );
HRESULT GetIndices( HRESULT GetIndexBuffer(
[out] IWineD3DBuffer **index_buffer [out] IWineD3DBuffer **index_buffer
); );
HRESULT SetBaseVertexIndex( HRESULT SetBaseVertexIndex(