Rico Schüller : include: Move D3D_RESOURCE_RETURN_TYPE to d3dcommon.h.
Alexandre Julliard
julliard at winehq.org
Thu Oct 28 12:19:49 CDT 2010
Module: wine
Branch: master
Commit: 5f5b6a3dc2c60ab0545b56fde1e9e8116411f124
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f5b6a3dc2c60ab0545b56fde1e9e8116411f124
Author: Rico Schüller <kgbricola at web.de>
Date: Wed Oct 27 21:33:22 2010 +0200
include: Move D3D_RESOURCE_RETURN_TYPE to d3dcommon.h.
---
include/d3d10shader.h | 12 ++----------
include/d3d11shader.h | 2 ++
include/d3dcommon.idl | 26 ++++++++++++++++++++++++++
3 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/include/d3d10shader.h b/include/d3d10shader.h
index d8a9c5f..0863a3c 100644
--- a/include/d3d10shader.h
+++ b/include/d3d10shader.h
@@ -114,21 +114,13 @@ typedef D3D_CBUFFER_TYPE *LPD3D10_CBUFFER_TYPE;
typedef D3D_REGISTER_COMPONENT_TYPE D3D10_REGISTER_COMPONENT_TYPE;
+typedef D3D_RESOURCE_RETURN_TYPE D3D10_RESOURCE_RETURN_TYPE;
+
typedef D3D_INCLUDE_TYPE D3D10_INCLUDE_TYPE;
typedef ID3DInclude ID3D10Include;
typedef ID3DInclude *LPD3D10INCLUDE;
#define IID_ID3D10Include IID_ID3DInclude
-typedef enum D3D10_RESOURCE_RETURN_TYPE
-{
- D3D10_RETURN_TYPE_UNORM = 1,
- D3D10_RETURN_TYPE_SNORM = 2,
- D3D10_RETURN_TYPE_SINT = 3,
- D3D10_RETURN_TYPE_UINT = 4,
- D3D10_RETURN_TYPE_FLOAT = 5,
- D3D10_RETURN_TYPE_MIXED = 6
-} D3D10_RESOURCE_RETURN_TYPE;
-
typedef struct _D3D10_SHADER_INPUT_BIND_DESC
{
LPCSTR Name;
diff --git a/include/d3d11shader.h b/include/d3d11shader.h
index f94d2b4..f6d4b31 100644
--- a/include/d3d11shader.h
+++ b/include/d3d11shader.h
@@ -23,4 +23,6 @@
typedef D3D_CBUFFER_TYPE D3D11_CBUFFER_TYPE;
+typedef D3D_RESOURCE_RETURN_TYPE D3D11_RESOURCE_RETURN_TYPE;
+
#endif
diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl
index d343120..dbd683c 100644
--- a/include/d3dcommon.idl
+++ b/include/d3dcommon.idl
@@ -163,3 +163,29 @@ typedef enum D3D_REGISTER_COMPONENT_TYPE
D3D10_REGISTER_COMPONENT_SINT32,
D3D10_REGISTER_COMPONENT_FLOAT32,
} D3D_REGISTER_COMPONENT_TYPE;
+
+typedef enum D3D_RESOURCE_RETURN_TYPE
+{
+ D3D_RETURN_TYPE_UNORM = 1,
+ D3D_RETURN_TYPE_SNORM,
+ D3D_RETURN_TYPE_SINT,
+ D3D_RETURN_TYPE_UINT,
+ D3D_RETURN_TYPE_FLOAT,
+ D3D_RETURN_TYPE_MIXED,
+ D3D_RETURN_TYPE_DOUBLE,
+ D3D_RETURN_TYPE_CONTINUED,
+ D3D10_RETURN_TYPE_UNORM = 1,
+ D3D10_RETURN_TYPE_SNORM,
+ D3D10_RETURN_TYPE_SINT,
+ D3D10_RETURN_TYPE_UINT,
+ D3D10_RETURN_TYPE_FLOAT,
+ D3D10_RETURN_TYPE_MIXED,
+ D3D11_RETURN_TYPE_UNORM = 1,
+ D3D11_RETURN_TYPE_SNORM,
+ D3D11_RETURN_TYPE_SINT,
+ D3D11_RETURN_TYPE_UINT,
+ D3D11_RETURN_TYPE_FLOAT,
+ D3D11_RETURN_TYPE_MIXED,
+ D3D11_RETURN_TYPE_DOUBLE,
+ D3D11_RETURN_TYPE_CONTINUED,
+} D3D_RESOURCE_RETURN_TYPE;
More information about the wine-cvs
mailing list