From 1bfdf232d966e1b78b32fe3903ffb78e7c59ee26 Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@free.fr>
Date: Tue, 5 Feb 2008 00:04:42 +0100
Subject: [PATCH] d3dx8: Add the d3dx8mesh.h header and move the relevant
 function declarations there.

Include d3dx8mesh.h in d3dx8.h and add some commented out ones as reminders.
---
 include/Makefile.in |  1 +
 include/d3dx8.h     |  4 ++++
 include/d3dx8core.h |  2 --
 include/d3dx8mesh.h | 36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 include/d3dx8mesh.h

diff --git a/include/Makefile.in b/include/Makefile.in
index cde66cc1e34..7562ebed1a1 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -115,6 +115,7 @@ SRCDIR_INCLUDES = \
 	d3dx8core.h \
 	d3dx8math.h \
 	d3dx8math.inl \
+	d3dx8mesh.h \
 	d3dx9.h \
 	d3dx9core.h \
 	d3dx9math.h \
diff --git a/include/d3dx8.h b/include/d3dx8.h
index 52ddaf3f7c4..0ae27c3a52e 100644
--- a/include/d3dx8.h
+++ b/include/d3dx8.h
@@ -24,5 +24,9 @@
 
 #include <d3dx8math.h>
 #include <d3dx8core.h>
+/* FIXME: #include <d3dx8tex.h> */
+#include <d3dx8mesh.h>
+/* FIXME: #include <d3dx8shape.h> */
+/* FIXME: #include <d3dx8effect.h> */
 
 #endif
diff --git a/include/d3dx8core.h b/include/d3dx8core.h
index 7e6806bc7ed..fb99e7adfda 100644
--- a/include/d3dx8core.h
+++ b/include/d3dx8core.h
@@ -109,9 +109,7 @@ DECLARE_INTERFACE_(ID3DXFont,IUnknown)
 extern "C" {
 #endif
 
-HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer);
 HRESULT WINAPI D3DXCreateFont(LPDIRECT3DDEVICE8 pDevice, HFONT hFont, LPD3DXFONT* ppFont);
-UINT WINAPI D3DXGetFVFVertexSize(DWORD FVF);
 HRESULT WINAPI D3DXAssembleShader(LPCVOID pSrcData, UINT SrcDataLen, DWORD Flags, 
 			   LPD3DXBUFFER* ppConstants, 
 			   LPD3DXBUFFER* ppCompiledShader,
diff --git a/include/d3dx8mesh.h b/include/d3dx8mesh.h
new file mode 100644
index 00000000000..f1eab5cd43c
--- /dev/null
+++ b/include/d3dx8mesh.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2008 Francois Gouget
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_D3DX8MESH_H
+#define __WINE_D3DX8MESH_H
+
+#include <d3d8.h>
+#include <dxfile.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+HRESULT WINAPI D3DXCreateBuffer(DWORD,LPD3DXBUFFER*);
+UINT    WINAPI D3DXGetFVFVertexSize(DWORD);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __WINE_D3DX8MESH_H */