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

[Alexandre Julliard]

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

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

include: Move D3D_SHADER_VARIABLE_CLASS to d3dcommon.h.

---

include/d3d10shader.h |   14 +++-----------
 include/d3dcommon.idl |   21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/include/d3d10shader.h b/include/d3d10shader.h
index 316f3ca..a711de3 100644
--- a/include/d3d10shader.h
+++ b/include/d3d10shader.h
@@ -43,17 +43,6 @@
 #define D3D10_SHADER_OPTIMIZATION_LEVEL2            0xC000
 #define D3D10_SHADER_OPTIMIZATION_LEVEL3            0x8000

-typedef enum _D3D10_SHADER_VARIABLE_CLASS
-{
-    D3D10_SVC_SCALAR,
-    D3D10_SVC_VECTOR,
-    D3D10_SVC_MATRIX_ROWS,
-    D3D10_SVC_MATRIX_COLUMNS,
-    D3D10_SVC_OBJECT,
-    D3D10_SVC_STRUCT,
-    D3D10_SVC_FORCE_DWORD = 0x7fffffff
-} D3D10_SHADER_VARIABLE_CLASS, *LPD3D10_SHADER_VARIABLE_CLASS;
-
 typedef enum _D3D10_SHADER_VARIABLE_TYPE
 {
     D3D10_SVT_VOID = 0,
@@ -131,6 +120,9 @@ typedef enum D3D10_REGISTER_COMPONENT_TYPE
 typedef D3D_SHADER_MACRO D3D10_SHADER_MACRO;
 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_INCLUDE_TYPE D3D10_INCLUDE_TYPE;
 typedef ID3DInclude ID3D10Include;
 typedef ID3DInclude *LPD3D10INCLUDE;
diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl
index 217b365..5bee2ed 100644
--- a/include/d3dcommon.idl
+++ b/include/d3dcommon.idl
@@ -67,3 +67,24 @@ interface ID3DInclude
 }

typedef ID3DInclude* LPD3DINCLUDE;
+
+typedef enum _D3D_SHADER_VARIABLE_CLASS
+{
+    D3D_SVC_SCALAR,
+    D3D_SVC_VECTOR,
+    D3D_SVC_MATRIX_ROWS,
+    D3D_SVC_MATRIX_COLUMNS,
+    D3D_SVC_OBJECT,
+    D3D_SVC_STRUCT,
+    D3D_SVC_INTERFACE_CLASS,
+    D3D_SVC_INTERFACE_POINTER,
+    D3D10_SVC_SCALAR = 0,
+    D3D10_SVC_VECTOR,
+    D3D10_SVC_MATRIX_ROWS,
+    D3D10_SVC_MATRIX_COLUMNS,
+    D3D10_SVC_OBJECT,
+    D3D10_SVC_STRUCT,
+    D3D11_SVC_INTERFACE_CLASS,
+    D3D11_SVC_INTERFACE_POINTER,
+    D3D_SVC_FORCE_DWORD = 0x7fffffff,
+} D3D_SHADER_VARIABLE_CLASS;