Rico Schüller : include: Move D3D_CBUFFER_TYPE to d3dcommon.h.

[Alexandre Julliard]

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

Author: Rico Schüller 
Date:   Mon Oct 25 20:30:35 2010 +0200

include: Move D3D_CBUFFER_TYPE to d3dcommon.h.

---

include/d3d10shader.h |    9 +++------
 include/d3d11shader.h |    2 ++
 include/d3dcommon.idl |   14 ++++++++++++++
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/include/d3d10shader.h b/include/d3d10shader.h
index a711de3..658db02 100644
--- a/include/d3d10shader.h
+++ b/include/d3d10shader.h
@@ -85,12 +85,6 @@ typedef enum _D3D10_SHADER_INPUT_TYPE
     D3D10_SIT_SAMPLER = 3
 } D3D10_SHADER_INPUT_TYPE, *LPD3D10_SHADER_INPUT_TYPE;

-typedef enum D3D10_CBUFFER_TYPE
-{
-    D3D10_CT_CBUFFER = 0,
-    D3D10_CT_TBUFFER = 1
-} D3D10_CBUFFER_TYPE, *LPD3D10_CBUFFER_TYPE;
-
 typedef enum D3D10_NAME
 {
     D3D10_NAME_UNDEFINED = 0,
@@ -123,6 +117,9 @@ typedef D3D_SHADER_MACRO *LPD3D10_SHADER_MACRO;
 typedef D3D_SHADER_VARIABLE_CLASS D3D10_SHADER_VARIABLE_CLASS;
 typedef D3D_SHADER_VARIABLE_CLASS *LPD3D10_SHADER_VARIABLE_CLASS;

+typedef D3D_CBUFFER_TYPE D3D10_CBUFFER_TYPE;
+typedef D3D_CBUFFER_TYPE *LPD3D10_CBUFFER_TYPE;
+
 typedef D3D_INCLUDE_TYPE D3D10_INCLUDE_TYPE;
 typedef ID3DInclude ID3D10Include;
 typedef ID3DInclude *LPD3D10INCLUDE;
diff --git a/include/d3d11shader.h b/include/d3d11shader.h
index 2ccb51a..f94d2b4 100644
--- a/include/d3d11shader.h
+++ b/include/d3d11shader.h
@@ -21,4 +21,6 @@

#include "d3dcommon.h"

+typedef D3D_CBUFFER_TYPE D3D11_CBUFFER_TYPE;
+
 #endif
diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl
index 5bee2ed..ffea63b 100644
--- a/include/d3dcommon.idl
+++ b/include/d3dcommon.idl
@@ -88,3 +88,17 @@ typedef enum _D3D_SHADER_VARIABLE_CLASS
     D3D11_SVC_INTERFACE_POINTER,
     D3D_SVC_FORCE_DWORD = 0x7fffffff,
 } D3D_SHADER_VARIABLE_CLASS;
+
+typedef enum D3D_CBUFFER_TYPE
+{
+    D3D_CT_CBUFFER,
+    D3D_CT_TBUFFER,
+    D3D_CT_INTERFACE_POINTERS,
+    D3D_CT_RESOURCE_BIND_INFO,
+    D3D10_CT_CBUFFER = 0,
+    D3D10_CT_TBUFFER,
+    D3D11_CT_CBUFFER = 0,
+    D3D11_CT_TBUFFER,
+    D3D11_CT_INTERFACE_POINTERS,
+    D3D11_CT_RESOURCE_BIND_INFO,
+} D3D_CBUFFER_TYPE;