[PATCH] include: Add d3dx10async.h (try 2)

Alistair Leslie-Hughes leslie_alistair at hotmail.com
Thu Nov 19 00:48:00 CST 2015


Corrected guard

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
---
 include/Makefile.in   |  1 +
 include/d3dx10.h      |  1 +
 include/d3dx10async.h | 43 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+)
 create mode 100644 include/d3dx10async.h

diff --git a/include/Makefile.in b/include/Makefile.in
index 27f0ef6..ea0e3fd 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -246,6 +246,7 @@ HEADER_SRCS = \
 	d3dtypes.h \
 	d3dvec.inl \
 	d3dx10.h \
+	d3dx10async.h \
 	d3dx9.h \
 	d3dx9anim.h \
 	d3dx9core.h \
diff --git a/include/d3dx10.h b/include/d3dx10.h
index 6333349..df7cdb1 100644
--- a/include/d3dx10.h
+++ b/include/d3dx10.h
@@ -28,5 +28,6 @@
 
 #include "d3d10.h"
 #include "d3dx10core.h"
+#include "d3dx10async.h"
 
 #endif
diff --git a/include/d3dx10async.h b/include/d3dx10async.h
new file mode 100644
index 0000000..a02d933
--- /dev/null
+++ b/include/d3dx10async.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2015 Alistair Leslie-Hughes
+ *
+ * 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 __D3DX10ASYNC_H__
+#define __D3DX10ASYNC_H__
+
+
+HRESULT WINAPI D3DX10CreateEffectFromFileA(const char *filename, const D3D10_SHADER_MACRO *defines,
+        ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device,
+        ID3D10EffectPool *effectpool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, ID3D10Blob **errors,
+        HRESULT *hresult);
+
+HRESULT WINAPI D3DX10CreateEffectFromFileW(const WCHAR *filename, const D3D10_SHADER_MACRO *defines,
+        ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device,
+        ID3D10EffectPool *effectpool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, ID3D10Blob **errors,
+        HRESULT *hresult);
+
+HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, const char *filename,
+        const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, UINT hlslflags,
+        UINT fxflags, ID3D10Device *device, ID3D10EffectPool *effectpool, ID3DX10ThreadPump *pump,
+        ID3D10Effect **effect, ID3D10Blob **errors, HRESULT *hresult);
+
+HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasize, const char *filename,
+        const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, UINT hlslflags,
+        UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool,
+        ID3D10Blob **errors, HRESULT *hresult);
+
+#endif
-- 
1.9.1




More information about the wine-patches mailing list