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

[Alexandre Julliard]

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

Author: Rico Schüller 
Date:   Wed Oct 27 21:33:33 2010 +0200

include: Move D3D_SHADER_INPUT_TYPE to d3dcommon.h.

---

include/d3d10shader.h |   11 +++--------
 include/d3dcommon.idl |   28 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/include/d3d10shader.h b/include/d3d10shader.h
index cfae6ae..b18b75e 100644
--- a/include/d3d10shader.h
+++ b/include/d3d10shader.h
@@ -77,14 +77,6 @@ typedef enum _D3D10_SHADER_VARIABLE_TYPE
     D3D10_SVT_FORCE_DWORD = 0x7fffffff
 } D3D10_SHADER_VARIABLE_TYPE, *LPD3D10_SHADER_VARIABLE_TYPE;

-typedef enum _D3D10_SHADER_INPUT_TYPE
-{
-    D3D10_SIT_CBUFFER = 0,
-    D3D10_SIT_TBUFFER = 1,
-    D3D10_SIT_TEXTURE = 2,
-    D3D10_SIT_SAMPLER = 3
-} D3D10_SHADER_INPUT_TYPE, *LPD3D10_SHADER_INPUT_TYPE;
-
 /* These are defined as version-neutral in d3dcommon.h */
 typedef D3D_SHADER_MACRO D3D10_SHADER_MACRO;
 typedef D3D_SHADER_MACRO *LPD3D10_SHADER_MACRO;
@@ -101,6 +93,9 @@ typedef D3D_RESOURCE_RETURN_TYPE D3D10_RESOURCE_RETURN_TYPE;

typedef D3D_NAME D3D10_NAME;

+typedef D3D_SHADER_INPUT_TYPE D3D10_SHADER_INPUT_TYPE;
+typedef D3D_SHADER_INPUT_TYPE *LPD3D10_SHADER_INPUT_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 f5ea54e..cbd0cb6 100644
--- a/include/d3dcommon.idl
+++ b/include/d3dcommon.idl
@@ -237,3 +237,31 @@ typedef enum D3D_NAME
     D3D11_NAME_DEPTH_GREATER_EQUAL,
     D3D11_NAME_DEPTH_LESS_EQUAL,
 } D3D_NAME;
+
+typedef enum _D3D_SHADER_INPUT_TYPE
+{
+    D3D_SIT_CBUFFER,
+    D3D_SIT_TBUFFER,
+    D3D_SIT_TEXTURE,
+    D3D_SIT_SAMPLER,
+    D3D_SIT_UAV_RWTYPED,
+    D3D_SIT_STRUCTURED,
+    D3D_SIT_UAV_RWSTRUCTURED,
+    D3D_SIT_BYTEADDRESS,
+    D3D_SIT_UAV_RWBYTEADDRESS,
+    D3D_SIT_UAV_APPEND_STRUCTURED,
+    D3D_SIT_UAV_CONSUME_STRUCTURED,
+    D3D_SIT_UAV_RWSTRUCTURED_WITH_COUNTER,
+    D3D10_SIT_CBUFFER = 0,
+    D3D10_SIT_TBUFFER,
+    D3D10_SIT_TEXTURE,
+    D3D10_SIT_SAMPLER,
+    D3D11_SIT_UAV_RWTYPED,
+    D3D11_SIT_STRUCTURED,
+    D3D11_SIT_UAV_RWSTRUCTURED,
+    D3D11_SIT_BYTEADDRESS,
+    D3D11_SIT_UAV_RWBYTEADDRESS,
+    D3D11_SIT_UAV_APPEND_STRUCTURED,
+    D3D11_SIT_UAV_CONSUME_STRUCTURED,
+    D3D11_SIT_UAV_RWSTRUCTURED_WITH_COUNTER,
+} D3D_SHADER_INPUT_TYPE;