Francois Gouget : include: Add some D3D import and include directives.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5cb365bac0807b2f656a199a748d945b9aa27849
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5cb365bac0807b2f656a199a74...

Author: Francois Gouget 
Date:   Fri Dec 30 09:31:53 2011 +0100

include: Add some D3D import and include directives.

---

include/d3d10.idl   |    4 +++-
 include/d3d10_1.idl |    2 ++
 include/d3d11.idl   |   10 ++++++++++
 3 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/include/d3d10.idl b/include/d3d10.idl
index 51b92bd..ac98942 100644
--- a/include/d3d10.idl
+++ b/include/d3d10.idl
@@ -1592,7 +1592,9 @@ interface ID3D10Multithread : IUnknown
         BOOL GetMultithreadProtected();
 }

+cpp_quote("#ifndef D3D10_IGNORE_SDK_LAYERS")
+cpp_quote("/* FIXME: # include <d3d10sdklayers.h> */")
+cpp_quote("#endif")
 cpp_quote("#include "d3d10misc.h"")
 cpp_quote("#include "d3d10shader.h"")
 cpp_quote("#include "d3d10effect.h"")
-/* TODO: Include "d310sdklayers.h" as soon as it exists */
diff --git a/include/d3d10_1.idl b/include/d3d10_1.idl
index 5724b63..11c52b4 100644
--- a/include/d3d10_1.idl
+++ b/include/d3d10_1.idl
@@ -20,6 +20,8 @@ import "oaidl.idl";
 import "ocidl.idl";

import "d3d10.idl";
+cpp_quote("#include <d3d10_1shader.h>")
+

typedef enum D3D10_FEATURE_LEVEL1
 {
diff --git a/include/d3d11.idl b/include/d3d11.idl
index 5959010..80b929c 100644
--- a/include/d3d11.idl
+++ b/include/d3d11.idl
@@ -21,6 +21,16 @@ import "ocidl.idl";
 import "dxgi.idl";
 import "d3dcommon.idl";

+cpp_quote("#include <d3d10_1.h>")
+cpp_quote("#ifndef D3D11_IGNORE_SDK_LAYERS")
+cpp_quote("/* FIXME: # include <d3d11sdklayers.h> */")
+cpp_quote("#endif")
+cpp_quote("#include <d3d10misc.h>")
+cpp_quote("#include <d3d10shader.h>")
+cpp_quote("#include <d3d10effect.h>")
+cpp_quote("#include <d3d10_1shader.h>")
+
+
 typedef D3D_SRV_DIMENSION D3D11_SRV_DIMENSION;

typedef D3D_PRIMITIVE D3D11_PRIMITIVE;