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

[Alexandre Julliard]

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

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

include: Move D3D_REGISTER_COMPONENT_TYPE to d3dcommon.h.

---

include/d3d10shader.h |   10 ++--------
 include/d3dcommon.idl |   12 ++++++++++++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/include/d3d10shader.h b/include/d3d10shader.h
index 658db02..d8a9c5f 100644
--- a/include/d3d10shader.h
+++ b/include/d3d10shader.h
@@ -102,14 +102,6 @@ typedef enum D3D10_NAME
     D3D10_NAME_DEPTH = 65,
 } D3D10_NAME;

-typedef enum D3D10_REGISTER_COMPONENT_TYPE
-{
-    D3D10_REGISTER_COMPONENT_UNKNOWN = 0,
-    D3D10_REGISTER_COMPONENT_UINT32 = 1,
-    D3D10_REGISTER_COMPONENT_SINT32 = 2,
-    D3D10_REGISTER_COMPONENT_FLOAT32 = 3,
-} D3D10_REGISTER_COMPONENT_TYPE;
-
 /* These are defined as version-neutral in d3dcommon.h */
 typedef D3D_SHADER_MACRO D3D10_SHADER_MACRO;
 typedef D3D_SHADER_MACRO *LPD3D10_SHADER_MACRO;
@@ -120,6 +112,8 @@ 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_REGISTER_COMPONENT_TYPE D3D10_REGISTER_COMPONENT_TYPE;
+
 typedef D3D_INCLUDE_TYPE D3D10_INCLUDE_TYPE;
 typedef ID3DInclude ID3D10Include;
 typedef ID3DInclude *LPD3D10INCLUDE;
diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl
index b68eb36..d343120 100644
--- a/include/d3dcommon.idl
+++ b/include/d3dcommon.idl
@@ -151,3 +151,15 @@ typedef enum D3D_SRV_DIMENSION
     D3D11_SRV_DIMENSION_TEXTURECUBEARRAY,
     D3D11_SRV_DIMENSION_BUFFEREX,
 } D3D_SRV_DIMENSION;
+
+typedef enum D3D_REGISTER_COMPONENT_TYPE
+{
+    D3D_REGISTER_COMPONENT_UNKNOWN,
+    D3D_REGISTER_COMPONENT_UINT32,
+    D3D_REGISTER_COMPONENT_SINT32,
+    D3D_REGISTER_COMPONENT_FLOAT32,
+    D3D10_REGISTER_COMPONENT_UNKNOWN = 0,
+    D3D10_REGISTER_COMPONENT_UINT32,
+    D3D10_REGISTER_COMPONENT_SINT32,
+    D3D10_REGISTER_COMPONENT_FLOAT32,
+} D3D_REGISTER_COMPONENT_TYPE;