Henri Verbeet : d3d9: Add a separate function for index buffer initialization.
Alexandre Julliard
julliard at winehq.org
Fri Sep 18 13:37:08 CDT 2009
Module: wine
Branch: master
Commit: 5ec05c556d4b660b314f28ba69efc2d232fabe46
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ec05c556d4b660b314f28ba69efc2d232fabe46
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Sep 17 23:03:28 2009 +0200
d3d9: Add a separate function for index buffer initialization.
---
dlls/d3d9/d3d9_private.h | 6 ++--
dlls/d3d9/device.c | 31 +++++++++++++++++++++++++++++
dlls/d3d9/indexbuffer.c | 48 +++++++++++++++------------------------------
3 files changed, 50 insertions(+), 35 deletions(-)
diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h
index e80d1a2..99ad4b6 100644
--- a/dlls/d3d9/d3d9_private.h
+++ b/dlls/d3d9/d3d9_private.h
@@ -200,9 +200,6 @@ extern UINT WINAPI IDirect3DDevice9Impl_GetNumberOfSwapChains(IDirect3DDevice9Ex
extern HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexBuffer(IDirect3DDevice9Ex *iface,
UINT Length, DWORD Usage, DWORD FVF, D3DPOOL Pool,
IDirect3DVertexBuffer9 **ppVertexBuffer, HANDLE *pSharedHandle) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI IDirect3DDevice9Impl_CreateIndexBuffer(IDirect3DDevice9Ex *iface,
- UINT Length, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool,
- IDirect3DIndexBuffer9 **ppIndexBuffer, HANDLE *pSharedHandle) DECLSPEC_HIDDEN;
extern HRESULT WINAPI IDirect3DDevice9Impl_CreateStateBlock(IDirect3DDevice9Ex *iface,
D3DSTATEBLOCKTYPE Type, IDirect3DStateBlock9 **ppSB) DECLSPEC_HIDDEN;
extern HRESULT WINAPI IDirect3DDevice9Impl_BeginStateBlock(IDirect3DDevice9Ex *iface) DECLSPEC_HIDDEN;
@@ -378,6 +375,9 @@ typedef struct IDirect3DIndexBuffer9Impl
WINED3DFORMAT format;
} IDirect3DIndexBuffer9Impl;
+HRESULT indexbuffer_init(IDirect3DIndexBuffer9Impl *buffer, IDirect3DDevice9Impl *device,
+ UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN;
+
/* --------------------- */
/* IDirect3DBaseTexture9 */
/* --------------------- */
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 7ddc0d6..a5d6858 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -742,6 +742,37 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateCubeTexture(IDirect3DDevice9Ex
return D3D_OK;
}
+static HRESULT WINAPI IDirect3DDevice9Impl_CreateIndexBuffer(IDirect3DDevice9Ex *iface, UINT size, DWORD usage,
+ D3DFORMAT format, D3DPOOL pool, IDirect3DIndexBuffer9 **buffer, HANDLE *shared_handle)
+{
+ IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
+ IDirect3DIndexBuffer9Impl *object;
+ HRESULT hr;
+
+ TRACE("iface %p, size %u, usage %#x, format %#x, pool %#x, buffer %p, shared_handle %p.\n",
+ iface, size, usage, format, pool, buffer, shared_handle);
+
+ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
+ if (!object)
+ {
+ ERR("Failed to allocate buffer memory.\n");
+ return D3DERR_OUTOFVIDEOMEMORY;
+ }
+
+ hr = indexbuffer_init(object, This, size, usage, format, pool);
+ if (FAILED(hr))
+ {
+ WARN("Failed to initialize index buffer, hr %#x.\n", hr);
+ HeapFree(GetProcessHeap(), 0, object);
+ return hr;
+ }
+
+ TRACE("Created index buffer %p.\n", object);
+ *buffer = (IDirect3DIndexBuffer9 *)object;
+
+ return D3D_OK;
+}
+
static HRESULT IDirect3DDevice9Impl_CreateSurface(LPDIRECT3DDEVICE9EX iface, UINT Width, UINT Height,
D3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, IDirect3DSurface9 **ppSurface,
UINT Usage, D3DPOOL Pool, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality)
diff --git a/dlls/d3d9/indexbuffer.c b/dlls/d3d9/indexbuffer.c
index 49f6fc8..6f0ae74 100644
--- a/dlls/d3d9/indexbuffer.c
+++ b/dlls/d3d9/indexbuffer.c
@@ -230,43 +230,27 @@ static const IDirect3DIndexBuffer9Vtbl Direct3DIndexBuffer9_Vtbl =
IDirect3DIndexBuffer9Impl_GetDesc
};
-
-/* IDirect3DDevice9 IDirect3DIndexBuffer9 Methods follow: */
-HRESULT WINAPI IDirect3DDevice9Impl_CreateIndexBuffer(IDirect3DDevice9Ex *iface, UINT Length, DWORD Usage,
- D3DFORMAT Format, D3DPOOL Pool, IDirect3DIndexBuffer9 **ppIndexBuffer, HANDLE *pSharedHandle)
+HRESULT indexbuffer_init(IDirect3DIndexBuffer9Impl *buffer, IDirect3DDevice9Impl *device,
+ UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool)
{
- IDirect3DIndexBuffer9Impl *object;
- IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
- HRESULT hrc = D3D_OK;
-
- TRACE("(%p) Relay\n", This);
- /* Allocate the storage for the device */
- object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
- if (NULL == object) {
- FIXME("Allocation of memory failed, returning D3DERR_OUTOFVIDEOMEMORY\n");
- return D3DERR_OUTOFVIDEOMEMORY;
- }
+ HRESULT hr;
- object->lpVtbl = &Direct3DIndexBuffer9_Vtbl;
- object->ref = 1;
- object->format = wined3dformat_from_d3dformat(Format);
- TRACE("Calling wined3d create index buffer\n");
+ buffer->lpVtbl = &Direct3DIndexBuffer9_Vtbl;
+ buffer->ref = 1;
+ buffer->format = wined3dformat_from_d3dformat(format);
wined3d_mutex_lock();
- hrc = IWineD3DDevice_CreateIndexBuffer(This->WineD3DDevice, Length, Usage & WINED3DUSAGE_MASK,
- (WINED3DPOOL)Pool, &object->wineD3DIndexBuffer, (IUnknown *)object);
+ 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;
+ }
- if (hrc != D3D_OK) {
+ buffer->parentDevice = (IDirect3DDevice9Ex *)device;
+ IDirect3DDevice9Ex_AddRef(buffer->parentDevice);
- /* free up object */
- FIXME("(%p) call to IWineD3DDevice_CreateIndexBuffer failed\n", This);
- HeapFree(GetProcessHeap(), 0, object);
- } else {
- IDirect3DDevice9Ex_AddRef(iface);
- object->parentDevice = iface;
- *ppIndexBuffer = (LPDIRECT3DINDEXBUFFER9) object;
- TRACE("(%p) : Created index buffer %p\n", This, object);
- }
- return hrc;
+ return D3D_OK;
}
More information about the wine-cvs
mailing list