include: Move D3D_CBUFFER_TYPE to d3dcommon.h.

This commit is contained in:
Rico Schüller 2010-10-25 20:30:35 +02:00 committed by Alexandre Julliard
parent 879f21471e
commit bc03f85f07
3 changed files with 19 additions and 6 deletions

View File

@ -85,12 +85,6 @@ typedef enum _D3D10_SHADER_INPUT_TYPE
D3D10_SIT_SAMPLER = 3 D3D10_SIT_SAMPLER = 3
} D3D10_SHADER_INPUT_TYPE, *LPD3D10_SHADER_INPUT_TYPE; } D3D10_SHADER_INPUT_TYPE, *LPD3D10_SHADER_INPUT_TYPE;
typedef enum D3D10_CBUFFER_TYPE
{
D3D10_CT_CBUFFER = 0,
D3D10_CT_TBUFFER = 1
} D3D10_CBUFFER_TYPE, *LPD3D10_CBUFFER_TYPE;
typedef enum D3D10_NAME typedef enum D3D10_NAME
{ {
D3D10_NAME_UNDEFINED = 0, D3D10_NAME_UNDEFINED = 0,
@ -123,6 +117,9 @@ typedef D3D_SHADER_MACRO *LPD3D10_SHADER_MACRO;
typedef D3D_SHADER_VARIABLE_CLASS D3D10_SHADER_VARIABLE_CLASS; typedef D3D_SHADER_VARIABLE_CLASS D3D10_SHADER_VARIABLE_CLASS;
typedef D3D_SHADER_VARIABLE_CLASS *LPD3D10_SHADER_VARIABLE_CLASS; 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_INCLUDE_TYPE D3D10_INCLUDE_TYPE; typedef D3D_INCLUDE_TYPE D3D10_INCLUDE_TYPE;
typedef ID3DInclude ID3D10Include; typedef ID3DInclude ID3D10Include;
typedef ID3DInclude *LPD3D10INCLUDE; typedef ID3DInclude *LPD3D10INCLUDE;

View File

@ -21,4 +21,6 @@
#include "d3dcommon.h" #include "d3dcommon.h"
typedef D3D_CBUFFER_TYPE D3D11_CBUFFER_TYPE;
#endif #endif

View File

@ -88,3 +88,17 @@ typedef enum _D3D_SHADER_VARIABLE_CLASS
D3D11_SVC_INTERFACE_POINTER, D3D11_SVC_INTERFACE_POINTER,
D3D_SVC_FORCE_DWORD = 0x7fffffff, D3D_SVC_FORCE_DWORD = 0x7fffffff,
} D3D_SHADER_VARIABLE_CLASS; } D3D_SHADER_VARIABLE_CLASS;
typedef enum D3D_CBUFFER_TYPE
{
D3D_CT_CBUFFER,
D3D_CT_TBUFFER,
D3D_CT_INTERFACE_POINTERS,
D3D_CT_RESOURCE_BIND_INFO,
D3D10_CT_CBUFFER = 0,
D3D10_CT_TBUFFER,
D3D11_CT_CBUFFER = 0,
D3D11_CT_TBUFFER,
D3D11_CT_INTERFACE_POINTERS,
D3D11_CT_RESOURCE_BIND_INFO,
} D3D_CBUFFER_TYPE;