Henri Verbeet : d3d9: Introduce a separate function for vertex declaration creation.
Alexandre Julliard
julliard at winehq.org
Thu Apr 12 15:23:11 CDT 2012
Module: wine
Branch: master
Commit: ba67df7a6034278dcfb5dd9e9da8449d20ba6099
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba67df7a6034278dcfb5dd9e9da8449d20ba6099
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Apr 11 22:52:02 2012 +0200
d3d9: Introduce a separate function for vertex declaration creation.
---
dlls/d3d9/d3d9_private.h | 4 ++--
dlls/d3d9/device.c | 23 ++++-------------------
dlls/d3d9/vertexdeclaration.c | 29 ++++++++++++++++++++++++++++-
3 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h
index 265ecfb..6ad6eed 100644
--- a/dlls/d3d9/d3d9_private.h
+++ b/dlls/d3d9/d3d9_private.h
@@ -395,8 +395,8 @@ typedef struct IDirect3DVertexDeclaration9Impl {
} IDirect3DVertexDeclaration9Impl;
void IDirect3DVertexDeclaration9Impl_Destroy(LPDIRECT3DVERTEXDECLARATION9 iface) DECLSPEC_HIDDEN;
-HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration9Impl *declaration,
- IDirect3DDevice9Impl *device, const D3DVERTEXELEMENT9 *elements) DECLSPEC_HIDDEN;
+HRESULT d3d9_vertex_declaration_create(IDirect3DDevice9Impl *device,
+ const D3DVERTEXELEMENT9 *elements, IDirect3DVertexDeclaration9Impl **declaration) DECLSPEC_HIDDEN;
/* ---------------------- */
/* IDirect3DVertexShader9 */
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index a9ca1d3..3aeb437 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -2073,7 +2073,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ProcessVertices(IDirect3DDevice9Ex *i
static HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(IDirect3DDevice9Ex *iface,
const D3DVERTEXELEMENT9 *elements, IDirect3DVertexDeclaration9 **declaration)
{
- IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface);
+ IDirect3DDevice9Impl *device = impl_from_IDirect3DDevice9Ex(iface);
IDirect3DVertexDeclaration9Impl *object;
HRESULT hr;
@@ -2085,25 +2085,10 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(IDirect3DDevi
return D3DERR_INVALIDCALL;
}
- object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
- if (!object)
- {
- ERR("Failed to allocate vertex declaration memory.\n");
- return E_OUTOFMEMORY;
- }
-
- hr = vertexdeclaration_init(object, This, elements);
- if (FAILED(hr))
- {
- WARN("Failed to initialize vertex declaration, hr %#x.\n", hr);
- HeapFree(GetProcessHeap(), 0, object);
- return hr;
- }
-
- TRACE("Created vertex declaration %p.\n", object);
- *declaration = (IDirect3DVertexDeclaration9 *)object;
+ if (SUCCEEDED(hr = d3d9_vertex_declaration_create(device, elements, &object)))
+ *declaration = (IDirect3DVertexDeclaration9 *)object;
- return D3D_OK;
+ return hr;
}
static HRESULT WINAPI IDirect3DDevice9Impl_SetVertexDeclaration(IDirect3DDevice9Ex *iface,
diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c
index 3ed9eb7..a003d88 100644
--- a/dlls/d3d9/vertexdeclaration.c
+++ b/dlls/d3d9/vertexdeclaration.c
@@ -367,7 +367,7 @@ static HRESULT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9 *d3d9_elem
return D3D_OK;
}
-HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration9Impl *declaration,
+static HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration9Impl *declaration,
IDirect3DDevice9Impl *device, const D3DVERTEXELEMENT9 *elements)
{
struct wined3d_vertex_element *wined3d_elements;
@@ -413,3 +413,30 @@ HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration9Impl *declaration,
return D3D_OK;
}
+
+HRESULT d3d9_vertex_declaration_create(IDirect3DDevice9Impl *device,
+ const D3DVERTEXELEMENT9 *elements, IDirect3DVertexDeclaration9Impl **declaration)
+{
+ IDirect3DVertexDeclaration9Impl *object;
+ HRESULT hr;
+
+ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
+ if (!object)
+ {
+ ERR("Failed to allocate vertex declaration memory.\n");
+ return E_OUTOFMEMORY;
+ }
+
+ hr = vertexdeclaration_init(object, device, elements);
+ if (FAILED(hr))
+ {
+ WARN("Failed to initialize vertex declaration, hr %#x.\n", hr);
+ HeapFree(GetProcessHeap(), 0, object);
+ return hr;
+ }
+
+ TRACE("Created vertex declaration %p.\n", object);
+ *declaration = object;
+
+ return D3D_OK;
+}
More information about the wine-cvs
mailing list