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

d3d8: Add a separate function for index buffer initialization.

This commit is contained in:
Henri Verbeet 2009-09-17 23:03:30 +02:00 committed by Alexandre Julliard
parent de9b47924d
commit 0201ddf264
3 changed files with 50 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/d3d8/d3d8_private.h
View File

@ -345,11 +345,6 @@ struct IDirect3DVertexBuffer8Impl
/* IDirect3DIndexBuffer8 */ /* IDirect3DIndexBuffer8 */
/* --------------------- */ /* --------------------- */
/*****************************************************************************
* Predeclare the interface implementation structures
*/
extern const IDirect3DIndexBuffer8Vtbl Direct3DIndexBuffer8_Vtbl DECLSPEC_HIDDEN;
/***************************************************************************** /*****************************************************************************
* IDirect3DIndexBuffer8 implementation structure * IDirect3DIndexBuffer8 implementation structure
*/ */
@ -368,6 +363,9 @@ struct IDirect3DIndexBuffer8Impl
WINED3DFORMAT format; WINED3DFORMAT format;
}; };
HRESULT indexbuffer_init(IDirect3DIndexBuffer8Impl *buffer, IDirect3DDevice8Impl *device,
UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN;
/* --------------------- */ /* --------------------- */
/* IDirect3DBaseTexture8 */ /* IDirect3DBaseTexture8 */
/* --------------------- */ /* --------------------- */

49
dlls/d3d8/device.c
View File

@ -787,42 +787,35 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexBuffer(LPDIRECT3DDEVICE8
return hrc; return hrc;
} }
static HRESULT WINAPI IDirect3DDevice8Impl_CreateIndexBuffer(LPDIRECT3DDEVICE8 iface, UINT Length, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DIndexBuffer8** ppIndexBuffer) { static HRESULT WINAPI IDirect3DDevice8Impl_CreateIndexBuffer(IDirect3DDevice8 *iface, UINT size, DWORD usage,
IDirect3DIndexBuffer8Impl *object; D3DFORMAT format, D3DPOOL pool, IDirect3DIndexBuffer8 **buffer)
{
IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
HRESULT hrc = D3D_OK; IDirect3DIndexBuffer8Impl *object;
HRESULT hr;
TRACE("iface %p, size %u, usage %#x, format %#x, pool %#x, buffer %p.\n",
iface, size, usage, format, pool, buffer);
TRACE("(%p) Relay\n", This);
/* Allocate the storage for the device */
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
if (NULL == object) { if (!object)
FIXME("Allocation of memory failed\n"); {
*ppIndexBuffer = NULL; ERR("Failed to allocate buffer memory.\n");
return D3DERR_OUTOFVIDEOMEMORY; return D3DERR_OUTOFVIDEOMEMORY;
} }
object->lpVtbl = &Direct3DIndexBuffer8_Vtbl; hr = indexbuffer_init(object, This, size, usage, format, pool);
object->ref = 1; if (FAILED(hr))
object->format = wined3dformat_from_d3dformat(Format); {
TRACE("Calling wined3d create index buffer\n"); WARN("Failed to initialize index buffer, hr %#x.\n", hr);
wined3d_mutex_lock();
hrc = IWineD3DDevice_CreateIndexBuffer(This->WineD3DDevice, Length, Usage & WINED3DUSAGE_MASK,
(WINED3DPOOL)Pool, &object->wineD3DIndexBuffer, (IUnknown *)object);
wined3d_mutex_unlock();
if (D3D_OK != hrc) {
/* free up object */
FIXME("(%p) call to IWineD3DDevice_CreateIndexBuffer failed\n", This);
HeapFree(GetProcessHeap(), 0, object); HeapFree(GetProcessHeap(), 0, object);
*ppIndexBuffer = NULL; return hr;
} else {
IUnknown_AddRef(iface);
object->parentDevice = iface;
*ppIndexBuffer = (LPDIRECT3DINDEXBUFFER8)object;
} }
return hrc;
TRACE("Created index buffer %p.\n", object);
*buffer = (IDirect3DIndexBuffer8 *)object;
return D3D_OK;
} }
static HRESULT IDirect3DDevice8Impl_CreateSurface(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, static HRESULT IDirect3DDevice8Impl_CreateSurface(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height,

28
dlls/d3d8/indexbuffer.c
View File

@ -207,8 +207,7 @@ static HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDesc(LPDIRECT3DINDEXBUFFER8 i
return hr; return hr;
} }
static const IDirect3DIndexBuffer8Vtbl Direct3DIndexBuffer8_Vtbl =
const IDirect3DIndexBuffer8Vtbl Direct3DIndexBuffer8_Vtbl =
{ {
/* IUnknown */ /* IUnknown */
IDirect3DIndexBuffer8Impl_QueryInterface, IDirect3DIndexBuffer8Impl_QueryInterface,
@ -228,3 +227,28 @@ const IDirect3DIndexBuffer8Vtbl Direct3DIndexBuffer8_Vtbl =
IDirect3DIndexBuffer8Impl_Unlock, IDirect3DIndexBuffer8Impl_Unlock,
IDirect3DIndexBuffer8Impl_GetDesc IDirect3DIndexBuffer8Impl_GetDesc
}; };
HRESULT indexbuffer_init(IDirect3DIndexBuffer8Impl *buffer, IDirect3DDevice8Impl *device,
UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool)
{
HRESULT hr;
buffer->lpVtbl = &Direct3DIndexBuffer8_Vtbl;
buffer->ref = 1;
buffer->format = wined3dformat_from_d3dformat(format);
wined3d_mutex_lock();
hr = IWineD3DDevice_CreateIndexBuffer(device->WineD3DDevice, size, usage & WINED3DUSAGE_MASK,
(WINED3DPOOL)pool, &buffer->wineD3DIndexBuffer, (IUnknown *)buffer);
wined3d_mutex_unlock();
if (FAILED(hr))
{
WARN("Failed to create wined3d buffer, hr %#x.\n", hr);
return hr;
}
buffer->parentDevice = (IDirect3DDevice8 *)device;
IUnknown_AddRef(buffer->parentDevice);
return D3D_OK;
}