[4/5] include: Update some d3d10shader.h definitions. [try 2]

[Matteo Bruni]

-------------- next part --------------
From dfbab37a624c0a92da6703bc6c0b2f061077feb5 Mon Sep 17 00:00:00 2001
From: Matteo Bruni <matteo.mystral at gmail.com>
Date: Thu, 26 Aug 2010 17:15:44 +0200
Subject: include: Update some d3d10shader.h definitions.

---
 include/d3d10shader.h |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/include/d3d10shader.h b/include/d3d10shader.h
index 592dd18..f06df30 100644
--- a/include/d3d10shader.h
+++ b/include/d3d10shader.h
@@ -127,11 +127,14 @@ typedef enum D3D10_REGISTER_COMPONENT_TYPE
     D3D10_REGISTER_COMPONENT_FLOAT32 = 3,
 } D3D10_REGISTER_COMPONENT_TYPE;
 
-typedef struct _D3D10_SHADER_MACRO
-{
-    LPCSTR Name;
-    LPCSTR Definition;
-} D3D10_SHADER_MACRO, *LPD3D10_SHADER_MACRO;
+/* These are defined as version-neutral in d3dcommon.h */
+typedef D3D_SHADER_MACRO D3D10_SHADER_MACRO;
+typedef D3D_SHADER_MACRO *LPD3D10_SHADER_MACRO;
+
+typedef D3D_INCLUDE_TYPE D3D10_INCLUDE_TYPE;
+typedef ID3DInclude ID3D10Include;
+typedef ID3DInclude *LPD3D10INCLUDE;
+#define IID_ID3D10Include IID_ID3DInclude
 
 typedef enum D3D10_RESOURCE_RETURN_TYPE
 {
@@ -279,6 +282,9 @@ DECLARE_INTERFACE_(ID3D10ShaderReflection, IUnknown)
 };
 #undef INTERFACE
 
+HRESULT WINAPI D3D10CompileShader(LPCSTR data, SIZE_T data_size, LPCSTR filename,
+        const D3D10_SHADER_MACRO *defines, ID3D10Include *include, LPCSTR entrypoint,
+        LPCSTR profile, UINT flags, ID3D10Blob **shader, ID3D10Blob **error_messages);
 LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device);
 LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device);
 LPCSTR WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device);
-- 
1.7.1