include: Move D3D_RESOURCE_RETURN_TYPE to d3dcommon.h.

This commit is contained in:
Rico Schüller 2010-10-27 21:33:22 +02:00 committed by Alexandre Julliard
parent 089d792498
commit 5f5b6a3dc2
3 changed files with 30 additions and 10 deletions

View File

@ -114,21 +114,13 @@ typedef D3D_CBUFFER_TYPE *LPD3D10_CBUFFER_TYPE;
typedef D3D_REGISTER_COMPONENT_TYPE D3D10_REGISTER_COMPONENT_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 D3D_INCLUDE_TYPE D3D10_INCLUDE_TYPE;
typedef ID3DInclude ID3D10Include; typedef ID3DInclude ID3D10Include;
typedef ID3DInclude *LPD3D10INCLUDE; typedef ID3DInclude *LPD3D10INCLUDE;
#define IID_ID3D10Include IID_ID3DInclude #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 typedef struct _D3D10_SHADER_INPUT_BIND_DESC
{ {
LPCSTR Name; LPCSTR Name;

View File

@ -23,4 +23,6 @@
typedef D3D_CBUFFER_TYPE D3D11_CBUFFER_TYPE; typedef D3D_CBUFFER_TYPE D3D11_CBUFFER_TYPE;
typedef D3D_RESOURCE_RETURN_TYPE D3D11_RESOURCE_RETURN_TYPE;
#endif #endif

View File

@ -163,3 +163,29 @@ typedef enum D3D_REGISTER_COMPONENT_TYPE
D3D10_REGISTER_COMPONENT_SINT32, D3D10_REGISTER_COMPONENT_SINT32,
D3D10_REGISTER_COMPONENT_FLOAT32, D3D10_REGISTER_COMPONENT_FLOAT32,
} D3D_REGISTER_COMPONENT_TYPE; } 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;