mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Silence more warnings

Browse Source 
- Don't include d3dx headers when including cgD3D9
This commit is contained in:
twinaphex 2018-02-03 13:11:31 +01:00
parent d446742d4b
commit 178730891d
5 changed files with 276 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/drivers_renderchain/d3d9_cg_renderchain.c
View File

@ -284,8 +284,6 @@ static void d3d9_cg_renderchain_set_shader_params(
set_cg_param(pass->vPrg, "IN.frame_count", frame_cnt); set_cg_param(pass->vPrg, "IN.frame_count", frame_cnt);
} }
#define DECL_FVF_TEXCOORD(stream, offset, index) \ #define DECL_FVF_TEXCOORD(stream, offset, index) \
{ (WORD)(stream), (WORD)(offset * sizeof(float)), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, \ { (WORD)(stream), (WORD)(offset * sizeof(float)), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, \
D3DDECLUSAGE_TEXCOORD, (BYTE)(index) } D3DDECLUSAGE_TEXCOORD, (BYTE)(index) }
@ -1147,7 +1145,7 @@ static bool d3d9_cg_renderchain_add_lut(void *data,
D3D_DEFAULT_NONPOW2, D3D_DEFAULT_NONPOW2,
0, 0,
0, 0,
D3DFMT_FROM_FILE, ((D3DFORMAT)-3), /* D3DFMT_FROM_FILE */
D3DPOOL_MANAGED, D3DPOOL_MANAGED,
smooth ? D3D_FILTER_LINEAR : D3D_FILTER_POINT, smooth ? D3D_FILTER_LINEAR : D3D_FILTER_POINT,
0, 0,

4
gfx/include/Cg/cgD3D9.h
View File

@ -59,7 +59,11 @@
#include "cg.h" #include "cg.h"
#include <d3d9.h> #include <d3d9.h>
#if 0
#ifdef HAVE_D3DX
#include "../d3d9/d3dx9.h" #include "../d3d9/d3dx9.h"
#endif
#endif
#include <windows.h> #include <windows.h>
/* Set up for either Win32 import/export/lib. */ /* Set up for either Win32 import/export/lib. */

251
gfx/include/d3d9/d3dx9effect.h
View File

@ -1,12 +1,12 @@
////////////////////////////////////////////////////////////////////////////// /*
// *
// Copyright (c) Microsoft Corporation. All rights reserved. * Copyright (c) Microsoft Corporation. All rights reserved.
// *
// File: d3dx9effect.h * File: d3dx9effect.h
// Content: D3DX effect types and Shaders * Content: D3DX effect types and Shaders
// *
////////////////////////////////////////////////////////////////////////////// */
#include "d3dx9.h" #include "d3dx9.h"
@ -24,90 +24,89 @@
#define D3DX_PARAMETER_LITERAL (1 << 1) #define D3DX_PARAMETER_LITERAL (1 << 1)
#define D3DX_PARAMETER_ANNOTATION (1 << 2) #define D3DX_PARAMETER_ANNOTATION (1 << 2)
//---------------------------------------------------------------------------- /*
// D3DXEFFECT_DESC: * D3DXEFFECT_DESC:
//---------------------------------------------------------------------------- */
typedef struct _D3DXEFFECT_DESC typedef struct _D3DXEFFECT_DESC
{ {
LPCSTR Creator; // Creator string LPCSTR Creator; /* Creator string */
UINT Parameters; // Number of parameters UINT Parameters; /* Number of parameters */
UINT Techniques; // Number of techniques UINT Techniques; /* Number of techniques */
UINT Functions; // Number of function entrypoints UINT Functions; /* Number of function entrypoints */
} D3DXEFFECT_DESC; } D3DXEFFECT_DESC;
//---------------------------------------------------------------------------- /*
// D3DXPARAMETER_DESC: * D3DXPARAMETER_DESC:
//---------------------------------------------------------------------------- */
typedef struct _D3DXPARAMETER_DESC typedef struct _D3DXPARAMETER_DESC
{ {
LPCSTR Name; // Parameter name LPCSTR Name; /* Parameter name */
LPCSTR Semantic; // Parameter semantic LPCSTR Semantic; /* Parameter semantic */
D3DXPARAMETER_CLASS Class; // Class D3DXPARAMETER_CLASS Class; /* Class */
D3DXPARAMETER_TYPE Type; // Component type D3DXPARAMETER_TYPE Type; /* Component type */
UINT Rows; // Number of rows UINT Rows; /* Number of rows */
UINT Columns; // Number of columns UINT Columns; /* Number of columns */
UINT Elements; // Number of array elements UINT Elements; /* Number of array elements */
UINT Annotations; // Number of annotations UINT Annotations; /* Number of annotations */
UINT StructMembers; // Number of structure member sub-parameters UINT StructMembers; /* Number of structure member sub-parameters */
DWORD Flags; // D3DX_PARAMETER_* flags DWORD Flags; /* D3DX_PARAMETER_* flags */
UINT Bytes; // Parameter size, in bytes UINT Bytes; /* Parameter size, in bytes */
} D3DXPARAMETER_DESC; } D3DXPARAMETER_DESC;
//---------------------------------------------------------------------------- /*
// D3DXTECHNIQUE_DESC: * D3DXTECHNIQUE_DESC:
//---------------------------------------------------------------------------- */
typedef struct _D3DXTECHNIQUE_DESC typedef struct _D3DXTECHNIQUE_DESC
{ {
LPCSTR Name; // Technique name LPCSTR Name; /* Technique name */
UINT Passes; // Number of passes UINT Passes; /* Number of passes */
UINT Annotations; // Number of annotations UINT Annotations; /* Number of annotations */
} D3DXTECHNIQUE_DESC; } D3DXTECHNIQUE_DESC;
//---------------------------------------------------------------------------- /*
// D3DXPASS_DESC: * D3DXPASS_DESC:
//---------------------------------------------------------------------------- */
typedef struct _D3DXPASS_DESC typedef struct _D3DXPASS_DESC
{ {
LPCSTR Name; // Pass name LPCSTR Name; /* Pass name */
UINT Annotations; // Number of annotations UINT Annotations; /* Number of annotations */
CONST DWORD *pVertexShaderFunction; // Vertex shader function CONST DWORD *pVertexShaderFunction; /* Vertex shader function */
CONST DWORD *pPixelShaderFunction; // Pixel shader function CONST DWORD *pPixelShaderFunction; /* Pixel shader function */
} D3DXPASS_DESC; } D3DXPASS_DESC;
//---------------------------------------------------------------------------- /*
// D3DXFUNCTION_DESC: * D3DXFUNCTION_DESC:
//---------------------------------------------------------------------------- */
typedef struct _D3DXFUNCTION_DESC typedef struct _D3DXFUNCTION_DESC
{ {
LPCSTR Name; // Function name LPCSTR Name; /* Function name */
UINT Annotations; // Number of annotations UINT Annotations; /* Number of annotations */
} D3DXFUNCTION_DESC; } D3DXFUNCTION_DESC;
/*
////////////////////////////////////////////////////////////////////////////// * ID3DXEffectPool
// ID3DXEffectPool /////////////////////////////////////////////////////////// */
//////////////////////////////////////////////////////////////////////////////
typedef interface ID3DXEffectPool ID3DXEffectPool; typedef interface ID3DXEffectPool ID3DXEffectPool;
typedef interface ID3DXEffectPool *LPD3DXEFFECTPOOL; typedef interface ID3DXEffectPool *LPD3DXEFFECTPOOL;
// {9537AB04-3250-412e-8213-FCD2F8677933} /* {9537AB04-3250-412e-8213-FCD2F8677933} */
DEFINE_GUID(IID_ID3DXEffectPool, DEFINE_GUID(IID_ID3DXEffectPool,
0x9537ab04, 0x3250, 0x412e, 0x82, 0x13, 0xfc, 0xd2, 0xf8, 0x67, 0x79, 0x33); 0x9537ab04, 0x3250, 0x412e, 0x82, 0x13, 0xfc, 0xd2, 0xf8, 0x67, 0x79, 0x33);
@ -117,23 +116,23 @@ DEFINE_GUID(IID_ID3DXEffectPool,
DECLARE_INTERFACE_(ID3DXEffectPool, IUnknown) DECLARE_INTERFACE_(ID3DXEffectPool, IUnknown)
{ {
// IUnknown /* IUnknown */
STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE; STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
// No public methods /* No public methods */
}; };
////////////////////////////////////////////////////////////////////////////// /*
// ID3DXBaseEffect /////////////////////////////////////////////////////////// * ID3DXBaseEffect
////////////////////////////////////////////////////////////////////////////// */
typedef interface ID3DXBaseEffect ID3DXBaseEffect; typedef interface ID3DXBaseEffect ID3DXBaseEffect;
typedef interface ID3DXBaseEffect *LPD3DXBASEEFFECT; typedef interface ID3DXBaseEffect *LPD3DXBASEEFFECT;
// {017C18AC-103F-4417-8C51-6BF6EF1E56BE} /* {017C18AC-103F-4417-8C51-6BF6EF1E56BE} */
DEFINE_GUID(IID_ID3DXBaseEffect, DEFINE_GUID(IID_ID3DXBaseEffect,
0x17c18ac, 0x103f, 0x4417, 0x8c, 0x51, 0x6b, 0xf6, 0xef, 0x1e, 0x56, 0xbe); 0x17c18ac, 0x103f, 0x4417, 0x8c, 0x51, 0x6b, 0xf6, 0xef, 0x1e, 0x56, 0xbe);
@ -143,19 +142,19 @@ DEFINE_GUID(IID_ID3DXBaseEffect,
DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown) DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown)
{ {
// IUnknown /* IUnknown */
STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE; STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
// Descs /* Descs */
STDMETHOD(GetDesc)(THIS_ D3DXEFFECT_DESC* pDesc) PURE; STDMETHOD(GetDesc)(THIS_ D3DXEFFECT_DESC* pDesc) PURE;
STDMETHOD(GetParameterDesc)(THIS_ D3DXHANDLE hParameter, D3DXPARAMETER_DESC* pDesc) PURE; STDMETHOD(GetParameterDesc)(THIS_ D3DXHANDLE hParameter, D3DXPARAMETER_DESC* pDesc) PURE;
STDMETHOD(GetTechniqueDesc)(THIS_ D3DXHANDLE hTechnique, D3DXTECHNIQUE_DESC* pDesc) PURE; STDMETHOD(GetTechniqueDesc)(THIS_ D3DXHANDLE hTechnique, D3DXTECHNIQUE_DESC* pDesc) PURE;
STDMETHOD(GetPassDesc)(THIS_ D3DXHANDLE hPass, D3DXPASS_DESC* pDesc) PURE; STDMETHOD(GetPassDesc)(THIS_ D3DXHANDLE hPass, D3DXPASS_DESC* pDesc) PURE;
STDMETHOD(GetFunctionDesc)(THIS_ D3DXHANDLE hShader, D3DXFUNCTION_DESC* pDesc) PURE; STDMETHOD(GetFunctionDesc)(THIS_ D3DXHANDLE hShader, D3DXFUNCTION_DESC* pDesc) PURE;
// Handle operations /* Handle operations */
STDMETHOD_(D3DXHANDLE, GetParameter)(THIS_ D3DXHANDLE hParameter, UINT Index) PURE; STDMETHOD_(D3DXHANDLE, GetParameter)(THIS_ D3DXHANDLE hParameter, UINT Index) PURE;
STDMETHOD_(D3DXHANDLE, GetParameterByName)(THIS_ D3DXHANDLE hParameter, LPCSTR pName) PURE; STDMETHOD_(D3DXHANDLE, GetParameterByName)(THIS_ D3DXHANDLE hParameter, LPCSTR pName) PURE;
STDMETHOD_(D3DXHANDLE, GetParameterBySemantic)(THIS_ D3DXHANDLE hParameter, LPCSTR pSemantic) PURE; STDMETHOD_(D3DXHANDLE, GetParameterBySemantic)(THIS_ D3DXHANDLE hParameter, LPCSTR pSemantic) PURE;
@ -169,7 +168,7 @@ DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown)
STDMETHOD_(D3DXHANDLE, GetAnnotation)(THIS_ D3DXHANDLE hObject, UINT Index) PURE; STDMETHOD_(D3DXHANDLE, GetAnnotation)(THIS_ D3DXHANDLE hObject, UINT Index) PURE;
STDMETHOD_(D3DXHANDLE, GetAnnotationByName)(THIS_ D3DXHANDLE hObject, LPCSTR pName) PURE; STDMETHOD_(D3DXHANDLE, GetAnnotationByName)(THIS_ D3DXHANDLE hObject, LPCSTR pName) PURE;
// Get/Set Parameters /* Get/Set Parameters */
STDMETHOD(SetValue)(THIS_ D3DXHANDLE hParameter, LPCVOID pData, UINT Bytes) PURE; STDMETHOD(SetValue)(THIS_ D3DXHANDLE hParameter, LPCVOID pData, UINT Bytes) PURE;
STDMETHOD(GetValue)(THIS_ D3DXHANDLE hParameter, LPVOID pData, UINT Bytes) PURE; STDMETHOD(GetValue)(THIS_ D3DXHANDLE hParameter, LPVOID pData, UINT Bytes) PURE;
STDMETHOD(SetBool)(THIS_ D3DXHANDLE hParameter, BOOL b) PURE; STDMETHOD(SetBool)(THIS_ D3DXHANDLE hParameter, BOOL b) PURE;
@ -207,24 +206,25 @@ DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown)
STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE hParameter, LPDIRECT3DPIXELSHADER9 *ppPShader) PURE; STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE hParameter, LPDIRECT3DPIXELSHADER9 *ppPShader) PURE;
STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE hParameter, LPDIRECT3DVERTEXSHADER9 *ppVShader) PURE; STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE hParameter, LPDIRECT3DVERTEXSHADER9 *ppVShader) PURE;
//Set Range of an Array to pass to device /* Set Range of an Array to pass to device
//Useful for sending only a subrange of an array down to the device * Useful for sending only a subrange of an
* array down to the device
*/
STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE hParameter, UINT uStart, UINT uEnd) PURE; STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE hParameter, UINT uStart, UINT uEnd) PURE;
}; };
/*
//---------------------------------------------------------------------------- * ID3DXEffectStateManager:
// ID3DXEffectStateManager: * ------------------------
// ------------------------ * This is a user implemented interface that can be used to manage device
// This is a user implemented interface that can be used to manage device * state changes made by an Effect.
// state changes made by an Effect. */
//----------------------------------------------------------------------------
typedef interface ID3DXEffectStateManager ID3DXEffectStateManager; typedef interface ID3DXEffectStateManager ID3DXEffectStateManager;
typedef interface ID3DXEffectStateManager *LPD3DXEFFECTSTATEMANAGER; typedef interface ID3DXEffectStateManager *LPD3DXEFFECTSTATEMANAGER;
// {79AAB587-6DBC-4fa7-82DE-37FA1781C5CE} /* {79AAB587-6DBC-4fa7-82DE-37FA1781C5CE} */
DEFINE_GUID(IID_ID3DXEffectStateManager, DEFINE_GUID(IID_ID3DXEffectStateManager,
0x79aab587, 0x6dbc, 0x4fa7, 0x82, 0xde, 0x37, 0xfa, 0x17, 0x81, 0xc5, 0xce); 0x79aab587, 0x6dbc, 0x4fa7, 0x82, 0xde, 0x37, 0xfa, 0x17, 0x81, 0xc5, 0xce);
@ -233,19 +233,20 @@ DEFINE_GUID(IID_ID3DXEffectStateManager,
DECLARE_INTERFACE_(ID3DXEffectStateManager, IUnknown) DECLARE_INTERFACE_(ID3DXEffectStateManager, IUnknown)
{ {
// The user must correctly implement QueryInterface, AddRef, and Release. /* The user must correctly implement QueryInterface, AddRef, and Release. */
// IUnknown /* IUnknown */
STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE; STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
// The following methods are called by the Effect when it wants to make /* The following methods are called by the Effect when it wants to make
// the corresponding device call. Note that: * the corresponding device call. Note that:
// 1. Users manage the state and are therefore responsible for making the * 1. Users manage the state and are therefore responsible for making the
// the corresponding device calls themselves inside their callbacks. * the corresponding device calls themselves inside their callbacks.
// 2. Effects pay attention to the return values of the callbacks, and so * 2. Effects pay attention to the return values of the callbacks, and so
// users must pay attention to what they return in their callbacks. * users must pay attention to what they return in their callbacks.
*/
STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX *pMatrix) PURE; STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX *pMatrix) PURE;
STDMETHOD(SetMaterial)(THIS_ CONST D3DMATERIAL9 *pMaterial) PURE; STDMETHOD(SetMaterial)(THIS_ CONST D3DMATERIAL9 *pMaterial) PURE;
@ -268,14 +269,14 @@ DECLARE_INTERFACE_(ID3DXEffectStateManager, IUnknown)
}; };
////////////////////////////////////////////////////////////////////////////// /*
// ID3DXEffect /////////////////////////////////////////////////////////////// * ID3DXEffect
////////////////////////////////////////////////////////////////////////////// */
typedef interface ID3DXEffect ID3DXEffect; typedef interface ID3DXEffect ID3DXEffect;
typedef interface ID3DXEffect *LPD3DXEFFECT; typedef interface ID3DXEffect *LPD3DXEFFECT;
// {F6CEB4B3-4E4C-40dd-B883-8D8DE5EA0CD5} /* {F6CEB4B3-4E4C-40dd-B883-8D8DE5EA0CD5} */
DEFINE_GUID(IID_ID3DXEffect, DEFINE_GUID(IID_ID3DXEffect,
0xf6ceb4b3, 0x4e4c, 0x40dd, 0xb8, 0x83, 0x8d, 0x8d, 0xe5, 0xea, 0xc, 0xd5); 0xf6ceb4b3, 0x4e4c, 0x40dd, 0xb8, 0x83, 0x8d, 0x8d, 0xe5, 0xea, 0xc, 0xd5);
@ -284,19 +285,19 @@ DEFINE_GUID(IID_ID3DXEffect,
DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect) DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect)
{ {
// ID3DXBaseEffect /* ID3DXBaseEffect */
STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE; STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
// Descs /* Descs */
STDMETHOD(GetDesc)(THIS_ D3DXEFFECT_DESC* pDesc) PURE; STDMETHOD(GetDesc)(THIS_ D3DXEFFECT_DESC* pDesc) PURE;
STDMETHOD(GetParameterDesc)(THIS_ D3DXHANDLE hParameter, D3DXPARAMETER_DESC* pDesc) PURE; STDMETHOD(GetParameterDesc)(THIS_ D3DXHANDLE hParameter, D3DXPARAMETER_DESC* pDesc) PURE;
STDMETHOD(GetTechniqueDesc)(THIS_ D3DXHANDLE hTechnique, D3DXTECHNIQUE_DESC* pDesc) PURE; STDMETHOD(GetTechniqueDesc)(THIS_ D3DXHANDLE hTechnique, D3DXTECHNIQUE_DESC* pDesc) PURE;
STDMETHOD(GetPassDesc)(THIS_ D3DXHANDLE hPass, D3DXPASS_DESC* pDesc) PURE; STDMETHOD(GetPassDesc)(THIS_ D3DXHANDLE hPass, D3DXPASS_DESC* pDesc) PURE;
STDMETHOD(GetFunctionDesc)(THIS_ D3DXHANDLE hShader, D3DXFUNCTION_DESC* pDesc) PURE; STDMETHOD(GetFunctionDesc)(THIS_ D3DXHANDLE hShader, D3DXFUNCTION_DESC* pDesc) PURE;
// Handle operations /* Handle operations */
STDMETHOD_(D3DXHANDLE, GetParameter)(THIS_ D3DXHANDLE hParameter, UINT Index) PURE; STDMETHOD_(D3DXHANDLE, GetParameter)(THIS_ D3DXHANDLE hParameter, UINT Index) PURE;
STDMETHOD_(D3DXHANDLE, GetParameterByName)(THIS_ D3DXHANDLE hParameter, LPCSTR pName) PURE; STDMETHOD_(D3DXHANDLE, GetParameterByName)(THIS_ D3DXHANDLE hParameter, LPCSTR pName) PURE;
STDMETHOD_(D3DXHANDLE, GetParameterBySemantic)(THIS_ D3DXHANDLE hParameter, LPCSTR pSemantic) PURE; STDMETHOD_(D3DXHANDLE, GetParameterBySemantic)(THIS_ D3DXHANDLE hParameter, LPCSTR pSemantic) PURE;
@ -310,7 +311,7 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect)
STDMETHOD_(D3DXHANDLE, GetAnnotation)(THIS_ D3DXHANDLE hObject, UINT Index) PURE; STDMETHOD_(D3DXHANDLE, GetAnnotation)(THIS_ D3DXHANDLE hObject, UINT Index) PURE;
STDMETHOD_(D3DXHANDLE, GetAnnotationByName)(THIS_ D3DXHANDLE hObject, LPCSTR pName) PURE; STDMETHOD_(D3DXHANDLE, GetAnnotationByName)(THIS_ D3DXHANDLE hObject, LPCSTR pName) PURE;
// Get/Set Parameters /* Get/Set Parameters */
STDMETHOD(SetValue)(THIS_ D3DXHANDLE hParameter, LPCVOID pData, UINT Bytes) PURE; STDMETHOD(SetValue)(THIS_ D3DXHANDLE hParameter, LPCVOID pData, UINT Bytes) PURE;
STDMETHOD(GetValue)(THIS_ D3DXHANDLE hParameter, LPVOID pData, UINT Bytes) PURE; STDMETHOD(GetValue)(THIS_ D3DXHANDLE hParameter, LPVOID pData, UINT Bytes) PURE;
STDMETHOD(SetBool)(THIS_ D3DXHANDLE hParameter, BOOL b) PURE; STDMETHOD(SetBool)(THIS_ D3DXHANDLE hParameter, BOOL b) PURE;
@ -348,65 +349,65 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect)
STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE hParameter, LPDIRECT3DPIXELSHADER9 *ppPShader) PURE; STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE hParameter, LPDIRECT3DPIXELSHADER9 *ppPShader) PURE;
STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE hParameter, LPDIRECT3DVERTEXSHADER9 *ppVShader) PURE; STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE hParameter, LPDIRECT3DVERTEXSHADER9 *ppVShader) PURE;
//Set Range of an Array to pass to device /* Set Range of an Array to pass to device
//Usefull for sending only a subrange of an array down to the device * Useful for sending only a subrange of an array down to the device
*/
STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE hParameter, UINT uStart, UINT uEnd) PURE; STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE hParameter, UINT uStart, UINT uEnd) PURE;
// ID3DXBaseEffect /* ID3DXBaseEffect */
/* Pool */
// Pool
STDMETHOD(GetPool)(THIS_ LPD3DXEFFECTPOOL* ppPool) PURE; STDMETHOD(GetPool)(THIS_ LPD3DXEFFECTPOOL* ppPool) PURE;
// Selecting and setting a technique /* Selecting and setting a technique */
STDMETHOD(SetTechnique)(THIS_ D3DXHANDLE hTechnique) PURE; STDMETHOD(SetTechnique)(THIS_ D3DXHANDLE hTechnique) PURE;
STDMETHOD_(D3DXHANDLE, GetCurrentTechnique)(THIS) PURE; STDMETHOD_(D3DXHANDLE, GetCurrentTechnique)(THIS) PURE;
STDMETHOD(ValidateTechnique)(THIS_ D3DXHANDLE hTechnique) PURE; STDMETHOD(ValidateTechnique)(THIS_ D3DXHANDLE hTechnique) PURE;
STDMETHOD(FindNextValidTechnique)(THIS_ D3DXHANDLE hTechnique, D3DXHANDLE *pTechnique) PURE; STDMETHOD(FindNextValidTechnique)(THIS_ D3DXHANDLE hTechnique, D3DXHANDLE *pTechnique) PURE;
STDMETHOD_(BOOL, IsParameterUsed)(THIS_ D3DXHANDLE hParameter, D3DXHANDLE hTechnique) PURE; STDMETHOD_(BOOL, IsParameterUsed)(THIS_ D3DXHANDLE hParameter, D3DXHANDLE hTechnique) PURE;
// Using current technique /* Using current technique
// Begin starts active technique * Begin starts active technique
// BeginPass begins a pass * BeginPass begins a pass
// CommitChanges updates changes to any set calls in the pass. This should be called before * CommitChanges updates changes to any set calls in the pass. This should be called before
// any DrawPrimitive call to d3d * any DrawPrimitive call to d3d
// EndPass ends a pass * EndPass ends a pass
// End ends active technique * End ends active technique
*/
STDMETHOD(Begin)(THIS_ UINT *pPasses, DWORD Flags) PURE; STDMETHOD(Begin)(THIS_ UINT *pPasses, DWORD Flags) PURE;
STDMETHOD(BeginPass)(THIS_ UINT Pass) PURE; STDMETHOD(BeginPass)(THIS_ UINT Pass) PURE;
STDMETHOD(CommitChanges)(THIS) PURE; STDMETHOD(CommitChanges)(THIS) PURE;
STDMETHOD(EndPass)(THIS) PURE; STDMETHOD(EndPass)(THIS) PURE;
STDMETHOD(End)(THIS) PURE; STDMETHOD(End)(THIS) PURE;
// Managing D3D Device /* Managing D3D Device */
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* ppDevice) PURE; STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* ppDevice) PURE;
STDMETHOD(OnLostDevice)(THIS) PURE; STDMETHOD(OnLostDevice)(THIS) PURE;
STDMETHOD(OnResetDevice)(THIS) PURE; STDMETHOD(OnResetDevice)(THIS) PURE;
// Logging device calls /* Logging device calls */
STDMETHOD(SetStateManager)(THIS_ LPD3DXEFFECTSTATEMANAGER pManager) PURE; STDMETHOD(SetStateManager)(THIS_ LPD3DXEFFECTSTATEMANAGER pManager) PURE;
STDMETHOD(GetStateManager)(THIS_ LPD3DXEFFECTSTATEMANAGER *ppManager) PURE; STDMETHOD(GetStateManager)(THIS_ LPD3DXEFFECTSTATEMANAGER *ppManager) PURE;
// Parameter blocks /* Parameter blocks */
STDMETHOD(BeginParameterBlock)(THIS) PURE; STDMETHOD(BeginParameterBlock)(THIS) PURE;
STDMETHOD_(D3DXHANDLE, EndParameterBlock)(THIS) PURE; STDMETHOD_(D3DXHANDLE, EndParameterBlock)(THIS) PURE;
STDMETHOD(ApplyParameterBlock)(THIS_ D3DXHANDLE hParameterBlock) PURE; STDMETHOD(ApplyParameterBlock)(THIS_ D3DXHANDLE hParameterBlock) PURE;
STDMETHOD(DeleteParameterBlock)(THIS_ D3DXHANDLE hParameterBlock) PURE; STDMETHOD(DeleteParameterBlock)(THIS_ D3DXHANDLE hParameterBlock) PURE;
// Cloning /* Cloning */
STDMETHOD(CloneEffect)(THIS_ LPDIRECT3DDEVICE9 pDevice, LPD3DXEFFECT* ppEffect) PURE; STDMETHOD(CloneEffect)(THIS_ LPDIRECT3DDEVICE9 pDevice, LPD3DXEFFECT* ppEffect) PURE;
// Fast path for setting variables directly in ID3DXEffect /* Fast path for setting variables directly in ID3DXEffect */
STDMETHOD(SetRawValue)(THIS_ D3DXHANDLE hParameter, LPCVOID pData, UINT ByteOffset, UINT Bytes) PURE; STDMETHOD(SetRawValue)(THIS_ D3DXHANDLE hParameter, LPCVOID pData, UINT ByteOffset, UINT Bytes) PURE;
}; };
////////////////////////////////////////////////////////////////////////////// /*
// ID3DXEffectCompiler /////////////////////////////////////////////////////// * ID3DXEffectCompiler
////////////////////////////////////////////////////////////////////////////// */
typedef interface ID3DXEffectCompiler ID3DXEffectCompiler; typedef interface ID3DXEffectCompiler ID3DXEffectCompiler;
typedef interface ID3DXEffectCompiler *LPD3DXEFFECTCOMPILER; typedef interface ID3DXEffectCompiler *LPD3DXEFFECTCOMPILER;
// {51B8A949-1A31-47e6-BEA0-4B30DB53F1E0} /* {51B8A949-1A31-47e6-BEA0-4B30DB53F1E0} */
DEFINE_GUID(IID_ID3DXEffectCompiler, DEFINE_GUID(IID_ID3DXEffectCompiler,
0x51b8a949, 0x1a31, 0x47e6, 0xbe, 0xa0, 0x4b, 0x30, 0xdb, 0x53, 0xf1, 0xe0); 0x51b8a949, 0x1a31, 0x47e6, 0xbe, 0xa0, 0x4b, 0x30, 0xdb, 0x53, 0xf1, 0xe0);
@ -416,19 +417,19 @@ DEFINE_GUID(IID_ID3DXEffectCompiler,
DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect) DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect)
{ {
// ID3DXBaseEffect /* ID3DXBaseEffect */
STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE; STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
// Descs /* Descs */
STDMETHOD(GetDesc)(THIS_ D3DXEFFECT_DESC* pDesc) PURE; STDMETHOD(GetDesc)(THIS_ D3DXEFFECT_DESC* pDesc) PURE;
STDMETHOD(GetParameterDesc)(THIS_ D3DXHANDLE hParameter, D3DXPARAMETER_DESC* pDesc) PURE; STDMETHOD(GetParameterDesc)(THIS_ D3DXHANDLE hParameter, D3DXPARAMETER_DESC* pDesc) PURE;
STDMETHOD(GetTechniqueDesc)(THIS_ D3DXHANDLE hTechnique, D3DXTECHNIQUE_DESC* pDesc) PURE; STDMETHOD(GetTechniqueDesc)(THIS_ D3DXHANDLE hTechnique, D3DXTECHNIQUE_DESC* pDesc) PURE;
STDMETHOD(GetPassDesc)(THIS_ D3DXHANDLE hPass, D3DXPASS_DESC* pDesc) PURE; STDMETHOD(GetPassDesc)(THIS_ D3DXHANDLE hPass, D3DXPASS_DESC* pDesc) PURE;
STDMETHOD(GetFunctionDesc)(THIS_ D3DXHANDLE hShader, D3DXFUNCTION_DESC* pDesc) PURE; STDMETHOD(GetFunctionDesc)(THIS_ D3DXHANDLE hShader, D3DXFUNCTION_DESC* pDesc) PURE;
// Handle operations /* Handle operations */
STDMETHOD_(D3DXHANDLE, GetParameter)(THIS_ D3DXHANDLE hParameter, UINT Index) PURE; STDMETHOD_(D3DXHANDLE, GetParameter)(THIS_ D3DXHANDLE hParameter, UINT Index) PURE;
STDMETHOD_(D3DXHANDLE, GetParameterByName)(THIS_ D3DXHANDLE hParameter, LPCSTR pName) PURE; STDMETHOD_(D3DXHANDLE, GetParameterByName)(THIS_ D3DXHANDLE hParameter, LPCSTR pName) PURE;
STDMETHOD_(D3DXHANDLE, GetParameterBySemantic)(THIS_ D3DXHANDLE hParameter, LPCSTR pSemantic) PURE; STDMETHOD_(D3DXHANDLE, GetParameterBySemantic)(THIS_ D3DXHANDLE hParameter, LPCSTR pSemantic) PURE;
@ -442,7 +443,7 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect)
STDMETHOD_(D3DXHANDLE, GetAnnotation)(THIS_ D3DXHANDLE hObject, UINT Index) PURE; STDMETHOD_(D3DXHANDLE, GetAnnotation)(THIS_ D3DXHANDLE hObject, UINT Index) PURE;
STDMETHOD_(D3DXHANDLE, GetAnnotationByName)(THIS_ D3DXHANDLE hObject, LPCSTR pName) PURE; STDMETHOD_(D3DXHANDLE, GetAnnotationByName)(THIS_ D3DXHANDLE hObject, LPCSTR pName) PURE;
// Get/Set Parameters /* Get/Set Parameters */
STDMETHOD(SetValue)(THIS_ D3DXHANDLE hParameter, LPCVOID pData, UINT Bytes) PURE; STDMETHOD(SetValue)(THIS_ D3DXHANDLE hParameter, LPCVOID pData, UINT Bytes) PURE;
STDMETHOD(GetValue)(THIS_ D3DXHANDLE hParameter, LPVOID pData, UINT Bytes) PURE; STDMETHOD(GetValue)(THIS_ D3DXHANDLE hParameter, LPVOID pData, UINT Bytes) PURE;
STDMETHOD(SetBool)(THIS_ D3DXHANDLE hParameter, BOOL b) PURE; STDMETHOD(SetBool)(THIS_ D3DXHANDLE hParameter, BOOL b) PURE;
@ -480,16 +481,16 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect)
STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE hParameter, LPDIRECT3DPIXELSHADER9 *ppPShader) PURE; STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE hParameter, LPDIRECT3DPIXELSHADER9 *ppPShader) PURE;
STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE hParameter, LPDIRECT3DVERTEXSHADER9 *ppVShader) PURE; STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE hParameter, LPDIRECT3DVERTEXSHADER9 *ppVShader) PURE;
//Set Range of an Array to pass to device /* Set Range of an Array to pass to device
//Usefull for sending only a subrange of an array down to the device * Useful for sending only a subrange of an array down to the device */
STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE hParameter, UINT uStart, UINT uEnd) PURE; STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE hParameter, UINT uStart, UINT uEnd) PURE;
// ID3DXBaseEffect
// Parameter sharing, specialization, and information /* ID3DXBaseEffect
* Parameter sharing, specialization, and information */
STDMETHOD(SetLiteral)(THIS_ D3DXHANDLE hParameter, BOOL Literal) PURE; STDMETHOD(SetLiteral)(THIS_ D3DXHANDLE hParameter, BOOL Literal) PURE;
STDMETHOD(GetLiteral)(THIS_ D3DXHANDLE hParameter, BOOL *pLiteral) PURE; STDMETHOD(GetLiteral)(THIS_ D3DXHANDLE hParameter, BOOL *pLiteral) PURE;
// Compilation /* Compilation */
STDMETHOD(CompileEffect)(THIS_ DWORD Flags, STDMETHOD(CompileEffect)(THIS_ DWORD Flags,
LPD3DXBUFFER* ppEffect, LPD3DXBUFFER* ppErrorMsgs) PURE; LPD3DXBUFFER* ppEffect, LPD3DXBUFFER* ppErrorMsgs) PURE;
@ -498,9 +499,9 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect)
}; };
////////////////////////////////////////////////////////////////////////////// /*
// APIs ////////////////////////////////////////////////////////////////////// * APIs
////////////////////////////////////////////////////////////////////////////// */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -729,6 +730,6 @@ HRESULT WINAPI
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif //__cplusplus #endif /* __cplusplus */
#endif //__D3DX9EFFECT_H__ #endif /* __D3DX9EFFECT_H__ */

102
gfx/include/d3d9/d3dx9math.h
View File

@ -1,11 +1,10 @@
////////////////////////////////////////////////////////////////////////////// /*
// *
// Copyright (C) Microsoft Corporation. All Rights Reserved. * Copyright (C) Microsoft Corporation. All Rights Reserved.
// *
// File: d3dx9math.h * File: d3dx9math.h
// Content: D3DX math types and functions * Content: D3DX math types and functions
// */
//////////////////////////////////////////////////////////////////////////////
#include "d3dx9.h" #include "d3dx9.h"
@ -17,36 +16,33 @@
#pragma warning(push) #pragma warning(push)
#endif #endif
//=========================================================================== /*
// *
// General purpose utilities * General purpose utilities
// *
//=========================================================================== */
#define D3DX_PI ((FLOAT) 3.141592654f) #define D3DX_PI ((FLOAT) 3.141592654f)
#define D3DX_1BYPI ((FLOAT) 0.318309886f) #define D3DX_1BYPI ((FLOAT) 0.318309886f)
#define D3DXToRadian( degree ) ((degree) * (D3DX_PI / 180.0f)) #define D3DXToRadian( degree ) ((degree) * (D3DX_PI / 180.0f))
#define D3DXToDegree( radian ) ((radian) * (180.0f / D3DX_PI)) #define D3DXToDegree( radian ) ((radian) * (180.0f / D3DX_PI))
/*
*
* 16 bit floating point numbers
*/
#define D3DX_16F_DIG 3 /* # of decimal digits of precision */
//=========================================================================== #define D3DX_16F_EPSILON 4.8875809e-4f /* smallest such that 1.0 + epsilon != 1.0 */
// #define D3DX_16F_MANT_DIG 11 /* # of bits in mantissa */
// 16 bit floating point numbers #define D3DX_16F_MAX 6.550400e+004 /* max value */
// #define D3DX_16F_MAX_10_EXP 4 /* max decimal exponent */
//=========================================================================== #define D3DX_16F_MAX_EXP 15 /* max binary exponent */
#define D3DX_16F_MIN 6.1035156e-5f /* min positive value */
#define D3DX_16F_DIG 3 // # of decimal digits of precision #define D3DX_16F_MIN_10_EXP (-4) /* min decimal exponent */
#define D3DX_16F_EPSILON 4.8875809e-4f // smallest such that 1.0 + epsilon != 1.0 #define D3DX_16F_MIN_EXP (-14) /* min binary exponent */
#define D3DX_16F_MANT_DIG 11 // # of bits in mantissa #define D3DX_16F_RADIX 2 /* exponent radix */
#define D3DX_16F_MAX 6.550400e+004 // max value #define D3DX_16F_ROUNDS 1 /* addition rounding: near */
#define D3DX_16F_MAX_10_EXP 4 // max decimal exponent
#define D3DX_16F_MAX_EXP 15 // max binary exponent
#define D3DX_16F_MIN 6.1035156e-5f // min positive value
#define D3DX_16F_MIN_10_EXP (-4) // min decimal exponent
#define D3DX_16F_MIN_EXP (-14) // min binary exponent
#define D3DX_16F_RADIX 2 // exponent radix
#define D3DX_16F_ROUNDS 1 // addition rounding: near
typedef struct D3DXFLOAT16 typedef struct D3DXFLOAT16
@ -79,9 +75,9 @@ protected:
*/ */
//-------------------------- /*
// 2D Vector * 2D Vector
//-------------------------- */
typedef struct D3DXVECTOR2 typedef struct D3DXVECTOR2
{ {
#ifdef __cplusplus #ifdef __cplusplus
@ -122,11 +118,9 @@ public:
FLOAT x, y; FLOAT x, y;
} D3DXVECTOR2, *LPD3DXVECTOR2; } D3DXVECTOR2, *LPD3DXVECTOR2;
/*
* 2D Vector (16 bit)
//-------------------------- */
// 2D Vector (16 bit)
//--------------------------
typedef struct D3DXVECTOR2_16F typedef struct D3DXVECTOR2_16F
{ {
@ -410,11 +404,11 @@ typedef D3DXMATRIX _D3DXMATRIXA16;
typedef D3DX_ALIGN16 _D3DXMATRIXA16 D3DXMATRIXA16, *LPD3DXMATRIXA16; typedef D3DX_ALIGN16 _D3DXMATRIXA16 D3DXMATRIXA16, *LPD3DXMATRIXA16;
//=========================================================================== /*
// *
// Quaternions * Quaternions
// */
//===========================================================================
typedef struct D3DXQUATERNION typedef struct D3DXQUATERNION
{ {
#ifdef __cplusplus #ifdef __cplusplus
@ -424,22 +418,22 @@ public:
D3DXQUATERNION( CONST D3DXFLOAT16 * ); D3DXQUATERNION( CONST D3DXFLOAT16 * );
D3DXQUATERNION( FLOAT x, FLOAT y, FLOAT z, FLOAT w ); D3DXQUATERNION( FLOAT x, FLOAT y, FLOAT z, FLOAT w );
// casting /* casting */
operator FLOAT* (); operator FLOAT* ();
operator CONST FLOAT* () const; operator CONST FLOAT* () const;
// assignment operators /* assignment operators */
D3DXQUATERNION& operator += ( CONST D3DXQUATERNION& ); D3DXQUATERNION& operator += ( CONST D3DXQUATERNION& );
D3DXQUATERNION& operator -= ( CONST D3DXQUATERNION& ); D3DXQUATERNION& operator -= ( CONST D3DXQUATERNION& );
D3DXQUATERNION& operator *= ( CONST D3DXQUATERNION& ); D3DXQUATERNION& operator *= ( CONST D3DXQUATERNION& );
D3DXQUATERNION& operator *= ( FLOAT ); D3DXQUATERNION& operator *= ( FLOAT );
D3DXQUATERNION& operator /= ( FLOAT ); D3DXQUATERNION& operator /= ( FLOAT );
// unary operators /* unary operators */
D3DXQUATERNION operator + () const; D3DXQUATERNION operator + () const;
D3DXQUATERNION operator - () const; D3DXQUATERNION operator - () const;
// binary operators /* binary operators */
D3DXQUATERNION operator + ( CONST D3DXQUATERNION& ) const; D3DXQUATERNION operator + ( CONST D3DXQUATERNION& ) const;
D3DXQUATERNION operator - ( CONST D3DXQUATERNION& ) const; D3DXQUATERNION operator - ( CONST D3DXQUATERNION& ) const;
D3DXQUATERNION operator * ( CONST D3DXQUATERNION& ) const; D3DXQUATERNION operator * ( CONST D3DXQUATERNION& ) const;
@ -451,16 +445,14 @@ public:
BOOL operator == ( CONST D3DXQUATERNION& ) const; BOOL operator == ( CONST D3DXQUATERNION& ) const;
BOOL operator != ( CONST D3DXQUATERNION& ) const; BOOL operator != ( CONST D3DXQUATERNION& ) const;
#endif //__cplusplus #endif /* __cplusplus */
FLOAT x, y, z, w; FLOAT x, y, z, w;
} D3DXQUATERNION, *LPD3DXQUATERNION; } D3DXQUATERNION, *LPD3DXQUATERNION;
/*
//=========================================================================== *
// * Planes
// Planes */
//
//===========================================================================
typedef struct D3DXPLANE typedef struct D3DXPLANE
{ {
#ifdef __cplusplus #ifdef __cplusplus

188
gfx/include/d3d9/d3dx9mesh.h
View File

@ -16,36 +16,37 @@
DEFINE_GUID(IID_ID3DXBaseMesh, DEFINE_GUID(IID_ID3DXBaseMesh,
0x7ed943dd, 0x52e8, 0x40b5, 0xa8, 0xd8, 0x76, 0x68, 0x5c, 0x40, 0x63, 0x30); 0x7ed943dd, 0x52e8, 0x40b5, 0xa8, 0xd8, 0x76, 0x68, 0x5c, 0x40, 0x63, 0x30);
// {4020E5C2-1403-4929-883F-E2E849FAC195} /* {4020E5C2-1403-4929-883F-E2E849FAC195} */
DEFINE_GUID(IID_ID3DXMesh, DEFINE_GUID(IID_ID3DXMesh,
0x4020e5c2, 0x1403, 0x4929, 0x88, 0x3f, 0xe2, 0xe8, 0x49, 0xfa, 0xc1, 0x95); 0x4020e5c2, 0x1403, 0x4929, 0x88, 0x3f, 0xe2, 0xe8, 0x49, 0xfa, 0xc1, 0x95);
// {8875769A-D579-4088-AAEB-534D1AD84E96} /* {8875769A-D579-4088-AAEB-534D1AD84E96} */
DEFINE_GUID(IID_ID3DXPMesh, DEFINE_GUID(IID_ID3DXPMesh,
0x8875769a, 0xd579, 0x4088, 0xaa, 0xeb, 0x53, 0x4d, 0x1a, 0xd8, 0x4e, 0x96); 0x8875769a, 0xd579, 0x4088, 0xaa, 0xeb, 0x53, 0x4d, 0x1a, 0xd8, 0x4e, 0x96);
// {667EA4C7-F1CD-4386-B523-7C0290B83CC5} /* {667EA4C7-F1CD-4386-B523-7C0290B83CC5} */
DEFINE_GUID(IID_ID3DXSPMesh, DEFINE_GUID(IID_ID3DXSPMesh,
0x667ea4c7, 0xf1cd, 0x4386, 0xb5, 0x23, 0x7c, 0x2, 0x90, 0xb8, 0x3c, 0xc5); 0x667ea4c7, 0xf1cd, 0x4386, 0xb5, 0x23, 0x7c, 0x2, 0x90, 0xb8, 0x3c, 0xc5);
// {11EAA540-F9A6-4d49-AE6A-E19221F70CC4} /* {11EAA540-F9A6-4d49-AE6A-E19221F70CC4} */
DEFINE_GUID(IID_ID3DXSkinInfo, DEFINE_GUID(IID_ID3DXSkinInfo,
0x11eaa540, 0xf9a6, 0x4d49, 0xae, 0x6a, 0xe1, 0x92, 0x21, 0xf7, 0xc, 0xc4); 0x11eaa540, 0xf9a6, 0x4d49, 0xae, 0x6a, 0xe1, 0x92, 0x21, 0xf7, 0xc, 0xc4);
// {3CE6CC22-DBF2-44f4-894D-F9C34A337139} /* {3CE6CC22-DBF2-44f4-894D-F9C34A337139} */
DEFINE_GUID(IID_ID3DXPatchMesh, DEFINE_GUID(IID_ID3DXPatchMesh,
0x3ce6cc22, 0xdbf2, 0x44f4, 0x89, 0x4d, 0xf9, 0xc3, 0x4a, 0x33, 0x71, 0x39); 0x3ce6cc22, 0xdbf2, 0x44f4, 0x89, 0x4d, 0xf9, 0xc3, 0x4a, 0x33, 0x71, 0x39);
//patch mesh can be quads or tris /* patch mesh can be quads or tris */
typedef enum _D3DXPATCHMESHTYPE { typedef enum _D3DXPATCHMESHTYPE
{
D3DXPATCHMESH_RECT = 0x001, D3DXPATCHMESH_RECT = 0x001,
D3DXPATCHMESH_TRI = 0x002, D3DXPATCHMESH_TRI = 0x002,
D3DXPATCHMESH_NPATCH = 0x003, D3DXPATCHMESH_NPATCH = 0x003,
D3DXPATCHMESH_FORCE_DWORD = 0x7fffffff, /* force 32-bit size enum */ D3DXPATCHMESH_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */
} D3DXPATCHMESHTYPE; } D3DXPATCHMESHTYPE;
// Mesh options - lower 3 bytes only, upper byte used by _D3DXMESHOPT option flags /* Mesh options - lower 3 bytes only, upper byte used by _D3DXMESHOPT option flags */
enum _D3DXMESH { enum _D3DXMESH {
D3DXMESH_32BIT = 0x001, // If set, then use 32 bit indices, if not set use 16 bit indices. D3DXMESH_32BIT = 0x001, // If set, then use 32 bit indices, if not set use 16 bit indices.
D3DXMESH_DONOTCLIP = 0x002, // Use D3DUSAGE_DONOTCLIP for VB & IB. D3DXMESH_DONOTCLIP = 0x002, // Use D3DUSAGE_DONOTCLIP for VB & IB.
@ -73,14 +74,14 @@ enum _D3DXMESH {
D3DXMESH_WRITEONLY = 0x440, // D3DXMESH_VB_WRITEONLY | D3DXMESH_IB_WRITEONLY D3DXMESH_WRITEONLY = 0x440, // D3DXMESH_VB_WRITEONLY | D3DXMESH_IB_WRITEONLY
D3DXMESH_DYNAMIC = 0x880, // D3DXMESH_VB_DYNAMIC | D3DXMESH_IB_DYNAMIC D3DXMESH_DYNAMIC = 0x880, // D3DXMESH_VB_DYNAMIC | D3DXMESH_IB_DYNAMIC
D3DXMESH_SOFTWAREPROCESSING = 0x18000 // D3DXMESH_VB_SOFTWAREPROCESSING | D3DXMESH_IB_SOFTWAREPROCESSING D3DXMESH_SOFTWAREPROCESSING = 0x18000 // D3DXMESH_VB_SOFTWAREPROCESSING | D3DXMESH_IB_SOFTWAREPROCESSING
}; };
//patch mesh options /* patch mesh options */
enum _D3DXPATCHMESH { enum _D3DXPATCHMESH {
D3DXPATCHMESH_DEFAULT = 000, D3DXPATCHMESH_DEFAULT = 000
}; };
// option field values for specifying min value in D3DXGeneratePMesh and D3DXSimplifyMesh
/* option field values for specifying min value in D3DXGeneratePMesh and D3DXSimplifyMesh */
enum _D3DXMESHSIMP enum _D3DXMESHSIMP
{ {
D3DXMESHSIMP_VERTEX = 0x1, D3DXMESHSIMP_VERTEX = 0x1,
@ -91,15 +92,15 @@ typedef enum _D3DXCLEANTYPE {
D3DXCLEAN_BACKFACING = 0x00000001, D3DXCLEAN_BACKFACING = 0x00000001,
D3DXCLEAN_BOWTIES = 0x00000002, D3DXCLEAN_BOWTIES = 0x00000002,
// Helper options /* Helper options */
D3DXCLEAN_SKINNING = D3DXCLEAN_BACKFACING, // Bowtie cleaning modifies geometry and breaks skinning D3DXCLEAN_SKINNING = D3DXCLEAN_BACKFACING, /* Bowtie cleaning modifies geometry and breaks skinning */
D3DXCLEAN_OPTIMIZATION = D3DXCLEAN_BACKFACING, D3DXCLEAN_OPTIMIZATION = D3DXCLEAN_BACKFACING,
D3DXCLEAN_SIMPLIFICATION= D3DXCLEAN_BACKFACING | D3DXCLEAN_BOWTIES D3DXCLEAN_SIMPLIFICATION= D3DXCLEAN_BACKFACING | D3DXCLEAN_BOWTIES
} D3DXCLEANTYPE; } D3DXCLEANTYPE;
enum _MAX_FVF_DECL_SIZE enum _MAX_FVF_DECL_SIZE
{ {
MAX_FVF_DECL_SIZE = MAXD3DDECLLENGTH + 1 // +1 for END MAX_FVF_DECL_SIZE = MAXD3DDECLLENGTH + 1 /* +1 for END */
}; };
typedef enum _D3DXTANGENT typedef enum _D3DXTANGENT
@ -118,9 +119,10 @@ typedef enum _D3DXTANGENT
D3DXTANGENT_GENERATE_IN_PLACE = 0x0400 D3DXTANGENT_GENERATE_IN_PLACE = 0x0400
} D3DXTANGENT; } D3DXTANGENT;
// D3DXIMT_WRAP_U means the texture wraps in the U direction /* D3DXIMT_WRAP_U means the texture wraps in the U direction
// D3DXIMT_WRAP_V means the texture wraps in the V direction * D3DXIMT_WRAP_V means the texture wraps in the V direction
// D3DXIMT_WRAP_UV means the texture wraps in both directions * D3DXIMT_WRAP_UV means the texture wraps in both directions
*/
typedef enum _D3DXIMT typedef enum _D3DXIMT
{ {
D3DXIMT_WRAP_U = 0x01, D3DXIMT_WRAP_U = 0x01,
@ -128,10 +130,11 @@ typedef enum _D3DXIMT
D3DXIMT_WRAP_UV = 0x03 D3DXIMT_WRAP_UV = 0x03
} D3DXIMT; } D3DXIMT;
// These options are only valid for UVAtlasCreate and UVAtlasPartition, we may add more for UVAtlasPack if necessary /* These options are only valid for UVAtlasCreate and UVAtlasPartition, we may add more for UVAtlasPack if necessary
// D3DXUVATLAS_DEFAULT - Meshes with more than 25k faces go through fast, meshes with fewer than 25k faces go through quality * D3DXUVATLAS_DEFAULT - Meshes with more than 25k faces go through fast, meshes with fewer than 25k faces go through quality
// D3DXUVATLAS_GEODESIC_FAST - Uses approximations to improve charting speed at the cost of added stretch or more charts. * D3DXUVATLAS_GEODESIC_FAST - Uses approximations to improve charting speed at the cost of added stretch or more charts.
// D3DXUVATLAS_GEODESIC_QUALITY - Provides better quality charts, but requires more time and memory than fast. * D3DXUVATLAS_GEODESIC_QUALITY - Provides better quality charts, but requires more time and memory than fast.
*/
typedef enum _D3DXUVATLAS typedef enum _D3DXUVATLAS
{ {
D3DXUVATLAS_DEFAULT = 0x00, D3DXUVATLAS_DEFAULT = 0x00,
@ -169,9 +172,9 @@ typedef D3DXMATERIAL *LPD3DXMATERIAL;
typedef enum _D3DXEFFECTDEFAULTTYPE typedef enum _D3DXEFFECTDEFAULTTYPE
{ {
D3DXEDT_STRING = 0x1, // pValue points to a null terminated ASCII string D3DXEDT_STRING = 0x1, /* pValue points to a null terminated ASCII string */
D3DXEDT_FLOATS = 0x2, // pValue points to an array of floats - number of floats is NumBytes / sizeof(float) D3DXEDT_FLOATS = 0x2, /* pValue points to an array of floats - number of floats is NumBytes / sizeof(float) */
D3DXEDT_DWORD = 0x3, // pValue points to a DWORD D3DXEDT_DWORD = 0x3, /* pValue points to a DWORD */
D3DXEDT_FORCEDWORD = 0x7fffffff D3DXEDT_FORCEDWORD = 0x7fffffff
} D3DXEFFECTDEFAULTTYPE; } D3DXEFFECTDEFAULTTYPE;
@ -179,9 +182,9 @@ typedef enum _D3DXEFFECTDEFAULTTYPE
typedef struct _D3DXEFFECTDEFAULT typedef struct _D3DXEFFECTDEFAULT
{ {
LPSTR pParamName; LPSTR pParamName;
D3DXEFFECTDEFAULTTYPE Type; // type of the data pointed to by pValue D3DXEFFECTDEFAULTTYPE Type; /* type of the data pointed to by pValue */
DWORD NumBytes; // size in bytes of the data pointed to by pValue DWORD NumBytes; /* size in bytes of the data pointed to by pValue */
LPVOID pValue; // data for the default of the effect LPVOID pValue; /* data for the default of the effect */
} D3DXEFFECTDEFAULT, *LPD3DXEFFECTDEFAULT; } D3DXEFFECTDEFAULT, *LPD3DXEFFECTDEFAULT;
typedef struct _D3DXEFFECTINSTANCE typedef struct _D3DXEFFECTINSTANCE
@ -205,25 +208,29 @@ typedef struct _D3DXATTRIBUTEWEIGHTS
enum _D3DXWELDEPSILONSFLAGS enum _D3DXWELDEPSILONSFLAGS
{ {
D3DXWELDEPSILONS_WELDALL = 0x1, // weld all vertices marked by adjacency as being overlapping D3DXWELDEPSILONS_WELDALL = 0x1, /* weld all vertices marked by adjacency as being overlapping */
D3DXWELDEPSILONS_WELDPARTIALMATCHES = 0x2, // if a given vertex component is within epsilon, modify partial matched D3DXWELDEPSILONS_WELDPARTIALMATCHES = 0x2, /* if a given vertex component is within epsilon, modify partial matched
// vertices so that both components identical AND if all components "equal" * vertices so that both components identical AND if all components "equal"
// remove one of the vertices * remove one of the vertices
D3DXWELDEPSILONS_DONOTREMOVEVERTICES = 0x4, // instructs weld to only allow modifications to vertices and not removal */
// ONLY valid if D3DXWELDEPSILONS_WELDPARTIALMATCHES is set D3DXWELDEPSILONS_DONOTREMOVEVERTICES = 0x4, /* instructs weld to only allow modifications to vertices and not removal
// useful to modify vertices to be equal, but not allow vertices to be removed * ONLY valid if D3DXWELDEPSILONS_WELDPARTIALMATCHES is set
* useful to modify vertices to be equal, but not allow vertices to be removed
*/
D3DXWELDEPSILONS_DONOTSPLIT = 0x8 // instructs weld to specify the D3DXMESHOPT_DONOTSPLIT flag when doing an Optimize(ATTR_SORT) D3DXWELDEPSILONS_DONOTSPLIT = 0x8 /* instructs weld to specify the D3DXMESHOPT_DONOTSPLIT flag when doing an Optimize(ATTR_SORT)
// if this flag is not set, all vertices that are in separate attribute groups * if this flag is not set, all vertices that are in separate attribute groups
// will remain split and not welded. Setting this flag can slow down software vertex processing * will remain split and not welded. Setting this flag can slow down software vertex processing
*/
}; };
typedef struct _D3DXWELDEPSILONS typedef struct _D3DXWELDEPSILONS
{ {
FLOAT Position; // NOTE: This does NOT replace the epsilon in GenerateAdjacency FLOAT Position; /* NOTE: This does NOT replace the epsilon in GenerateAdjacency
// in general, it should be the same value or greater than the one passed to GeneratedAdjacency * in general, it should be the same value or greater than the one passed to GeneratedAdjacency
*/
FLOAT BlendWeights; FLOAT BlendWeights;
FLOAT Normal; FLOAT Normal;
FLOAT PSize; FLOAT PSize;
@ -243,12 +250,12 @@ typedef D3DXWELDEPSILONS* LPD3DXWELDEPSILONS;
DECLARE_INTERFACE_(ID3DXBaseMesh, IUnknown) DECLARE_INTERFACE_(ID3DXBaseMesh, IUnknown)
{ {
// IUnknown /* IUnknown */
STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE; STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
// ID3DXBaseMesh /* ID3DXBaseMesh */
STDMETHOD(DrawSubset)(THIS_ DWORD AttribId) PURE; STDMETHOD(DrawSubset)(THIS_ DWORD AttribId) PURE;
STDMETHOD_(DWORD, GetNumFaces)(THIS) PURE; STDMETHOD_(DWORD, GetNumFaces)(THIS) PURE;
STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE; STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE;
@ -283,12 +290,12 @@ DECLARE_INTERFACE_(ID3DXBaseMesh, IUnknown)
DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh) DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh)
{ {
// IUnknown /* IUnknown */
STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE; STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
// ID3DXBaseMesh /* ID3DXBaseMesh */
STDMETHOD(DrawSubset)(THIS_ DWORD AttribId) PURE; STDMETHOD(DrawSubset)(THIS_ DWORD AttribId) PURE;
STDMETHOD_(DWORD, GetNumFaces)(THIS) PURE; STDMETHOD_(DWORD, GetNumFaces)(THIS) PURE;
STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE; STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE;
@ -316,7 +323,7 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh)
STDMETHOD(UpdateSemantics)(THIS_ D3DVERTEXELEMENT9 Declaration[MAX_FVF_DECL_SIZE]) PURE; STDMETHOD(UpdateSemantics)(THIS_ D3DVERTEXELEMENT9 Declaration[MAX_FVF_DECL_SIZE]) PURE;
// ID3DXMesh /* ID3DXMesh */
STDMETHOD(LockAttributeBuffer)(THIS_ DWORD Flags, DWORD** ppData) PURE; STDMETHOD(LockAttributeBuffer)(THIS_ DWORD Flags, DWORD** ppData) PURE;
STDMETHOD(UnlockAttributeBuffer)(THIS) PURE; STDMETHOD(UnlockAttributeBuffer)(THIS) PURE;
STDMETHOD(Optimize)(THIS_ DWORD Flags, CONST DWORD* pAdjacencyIn, DWORD* pAdjacencyOut, STDMETHOD(Optimize)(THIS_ DWORD Flags, CONST DWORD* pAdjacencyIn, DWORD* pAdjacencyOut,
@ -333,12 +340,12 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh)
DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh) DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh)
{ {
// IUnknown /* IUnknown */
STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE; STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
// ID3DXBaseMesh /* ID3DXBaseMesh */
STDMETHOD(DrawSubset)(THIS_ DWORD AttribId) PURE; STDMETHOD(DrawSubset)(THIS_ DWORD AttribId) PURE;
STDMETHOD_(DWORD, GetNumFaces)(THIS) PURE; STDMETHOD_(DWORD, GetNumFaces)(THIS) PURE;
STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE; STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE;
@ -366,7 +373,7 @@ DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh)
STDMETHOD(UpdateSemantics)(THIS_ D3DVERTEXELEMENT9 Declaration[MAX_FVF_DECL_SIZE]) PURE; STDMETHOD(UpdateSemantics)(THIS_ D3DVERTEXELEMENT9 Declaration[MAX_FVF_DECL_SIZE]) PURE;
// ID3DXPMesh /* ID3DXPMesh */
STDMETHOD(ClonePMeshFVF)(THIS_ DWORD Options, STDMETHOD(ClonePMeshFVF)(THIS_ DWORD Options,
DWORD FVF, LPDIRECT3DDEVICE9 pD3DDevice, LPD3DXPMESH* ppCloneMesh) PURE; DWORD FVF, LPDIRECT3DDEVICE9 pD3DDevice, LPD3DXPMESH* ppCloneMesh) PURE;
STDMETHOD(ClonePMesh)(THIS_ DWORD Options, STDMETHOD(ClonePMesh)(THIS_ DWORD Options,
@ -389,8 +396,8 @@ DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh)
STDMETHOD(GetAdjacency)(THIS_ DWORD* pAdjacency) PURE; STDMETHOD(GetAdjacency)(THIS_ DWORD* pAdjacency) PURE;
// Used to generate the immediate "ancestor" for each vertex when it is removed by a vsplit. Allows generation of geomorphs /* Used to generate the immediate "ancestor" for each vertex when it is removed by a vsplit. Allows generation of geomorphs
// Vertex buffer must be equal to or greater than the maximum number of vertices in the pmesh * Vertex buffer must be equal to or greater than the maximum number of vertices in the pmesh */
STDMETHOD(GenerateVertexHistory)(THIS_ DWORD* pVertexHistory) PURE; STDMETHOD(GenerateVertexHistory)(THIS_ DWORD* pVertexHistory) PURE;
}; };
@ -400,12 +407,12 @@ DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh)
DECLARE_INTERFACE_(ID3DXSPMesh, IUnknown) DECLARE_INTERFACE_(ID3DXSPMesh, IUnknown)
{ {
// IUnknown /* IUnknown */
STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE; STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
// ID3DXSPMesh /* ID3DXSPMesh */
STDMETHOD_(DWORD, GetNumFaces)(THIS) PURE; STDMETHOD_(DWORD, GetNumFaces)(THIS) PURE;
STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE; STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE;
STDMETHOD_(DWORD, GetFVF)(THIS) PURE; STDMETHOD_(DWORD, GetFVF)(THIS) PURE;
@ -431,22 +438,23 @@ DECLARE_INTERFACE_(ID3DXSPMesh, IUnknown)
#define UNUSED16 (0xffff) #define UNUSED16 (0xffff)
#define UNUSED32 (0xffffffff) #define UNUSED32 (0xffffffff)
// ID3DXMesh::Optimize options - upper byte only, lower 3 bytes used from _D3DXMESH option flags /* ID3DXMesh::Optimize options - upper byte only, lower 3 bytes used from _D3DXMESH option flags */
enum _D3DXMESHOPT { enum _D3DXMESHOPT
D3DXMESHOPT_COMPACT = 0x01000000, {
D3DXMESHOPT_ATTRSORT = 0x02000000, D3DXMESHOPT_COMPACT = 0x01000000,
D3DXMESHOPT_VERTEXCACHE = 0x04000000, D3DXMESHOPT_ATTRSORT = 0x02000000,
D3DXMESHOPT_STRIPREORDER = 0x08000000, D3DXMESHOPT_VERTEXCACHE = 0x04000000,
D3DXMESHOPT_IGNOREVERTS = 0x10000000, // optimize faces only, don't touch vertices D3DXMESHOPT_STRIPREORDER = 0x08000000,
D3DXMESHOPT_DONOTSPLIT = 0x20000000, // do not split vertices shared between attribute groups when attribute sorting D3DXMESHOPT_IGNOREVERTS = 0x10000000, /* optimize faces only, don't touch vertices */
D3DXMESHOPT_DEVICEINDEPENDENT = 0x00400000 // Only affects VCache. uses a static known good cache size for all cards D3DXMESHOPT_DONOTSPLIT = 0x20000000, /* do not split vertices shared between attribute groups when attribute sorting */
D3DXMESHOPT_DEVICEINDEPENDENT = 0x00400000 /* Only affects VCache. uses a static known good cache size for all cards */
// D3DXMESHOPT_SHAREVB has been removed, please use D3DXMESH_VB_SHARE instead /* D3DXMESHOPT_SHAREVB has been removed, please use D3DXMESH_VB_SHARE instead */
}; };
// Subset of the mesh that has the same attribute and bone combination. /* Subset of the mesh that has the same attribute and bone combination.
// This subset can be rendered in a single draw call * This subset can be rendered in a single draw call */
typedef struct _D3DXBONECOMBINATION typedef struct _D3DXBONECOMBINATION
{ {
DWORD AttribId; DWORD AttribId;
@ -457,13 +465,14 @@ typedef struct _D3DXBONECOMBINATION
DWORD* BoneId; DWORD* BoneId;
} D3DXBONECOMBINATION, *LPD3DXBONECOMBINATION; } D3DXBONECOMBINATION, *LPD3DXBONECOMBINATION;
// The following types of patch combinations are supported: /* The following types of patch combinations are supported:
// Patch type Basis Degree * Patch type Basis Degree
// Rect Bezier 2,3,5 * Rect Bezier 2,3,5
// Rect B-Spline 2,3,5 * Rect B-Spline 2,3,5
// Rect Catmull-Rom 3 * Rect Catmull-Rom 3
// Tri Bezier 2,3,5 * Tri Bezier 2,3,5
// N-Patch N/A 3 * N-Patch N/A 3
*/
typedef struct _D3DXPATCHINFO typedef struct _D3DXPATCHINFO
{ {
@ -477,14 +486,14 @@ typedef struct _D3DXPATCHINFO
DECLARE_INTERFACE_(ID3DXPatchMesh, IUnknown) DECLARE_INTERFACE_(ID3DXPatchMesh, IUnknown)
{ {
// IUnknown /* IUnknown */
STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE; STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
// ID3DXPatchMesh /* ID3DXPatchMesh */
// Return creation parameters /* Return creation parameters */
STDMETHOD_(DWORD, GetNumPatches)(THIS) PURE; STDMETHOD_(DWORD, GetNumPatches)(THIS) PURE;
STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE; STDMETHOD_(DWORD, GetNumVertices)(THIS) PURE;
STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9 Declaration[MAX_FVF_DECL_SIZE]) PURE; STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9 Declaration[MAX_FVF_DECL_SIZE]) PURE;
@ -493,7 +502,7 @@ DECLARE_INTERFACE_(ID3DXPatchMesh, IUnknown)
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9 *ppDevice) PURE; STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9 *ppDevice) PURE;
STDMETHOD(GetPatchInfo)(THIS_ LPD3DXPATCHINFO PatchInfo) PURE; STDMETHOD(GetPatchInfo)(THIS_ LPD3DXPATCHINFO PatchInfo) PURE;
// Control mesh access /* Control mesh access */
STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* ppVB) PURE; STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* ppVB) PURE;
STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER9* ppIB) PURE; STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER9* ppIB) PURE;
STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID *ppData) PURE; STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID *ppData) PURE;
@ -2724,20 +2733,19 @@ HRESULT WINAPI
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif //__cplusplus #endif /* __cplusplus */
////////////////////////////////////////////////////////////////////////////// /*
// *
// Definitions of .X file templates used by mesh load/save functions * Definitions of .X file templates used by mesh load/save functions
// that are not RM standard * that are not RM standard
// */
//////////////////////////////////////////////////////////////////////////////
// {3CF169CE-FF7C-44ab-93C0-F78F62D172E2} /* {3CF169CE-FF7C-44ab-93C0-F78F62D172E2} */
DEFINE_GUID(DXFILEOBJ_XSkinMeshHeader, DEFINE_GUID(DXFILEOBJ_XSkinMeshHeader,
0x3cf169ce, 0xff7c, 0x44ab, 0x93, 0xc0, 0xf7, 0x8f, 0x62, 0xd1, 0x72, 0xe2); 0x3cf169ce, 0xff7c, 0x44ab, 0x93, 0xc0, 0xf7, 0x8f, 0x62, 0xd1, 0x72, 0xe2);
// {B8D65549-D7C9-4995-89CF-53A9A8B031E3} /* {B8D65549-D7C9-4995-89CF-53A9A8B031E3} */
DEFINE_GUID(DXFILEOBJ_VertexDuplicationIndices, DEFINE_GUID(DXFILEOBJ_VertexDuplicationIndices,
0xb8d65549, 0xd7c9, 0x4995, 0x89, 0xcf, 0x53, 0xa9, 0xa8, 0xb0, 0x31, 0xe3); 0xb8d65549, 0xd7c9, 0x4995, 0x89, 0xcf, 0x53, 0xa9, 0xa8, 0xb0, 0x31, 0xe3);
@ -2801,23 +2809,23 @@ DEFINE_GUID(DXFILEOBJ_EffectDWord,
DEFINE_GUID(DXFILEOBJ_EffectParamFloats, DEFINE_GUID(DXFILEOBJ_EffectParamFloats,
0x3014b9a0, 0x62f5, 0x478c, 0x9b, 0x86, 0xe4, 0xac, 0x9f, 0x4e, 0x41, 0x8b); 0x3014b9a0, 0x62f5, 0x478c, 0x9b, 0x86, 0xe4, 0xac, 0x9f, 0x4e, 0x41, 0x8b);
// {1DBC4C88-94C1-46ee-9076-2C28818C9481} /* {1DBC4C88-94C1-46ee-9076-2C28818C9481} */
DEFINE_GUID(DXFILEOBJ_EffectParamString, DEFINE_GUID(DXFILEOBJ_EffectParamString,
0x1dbc4c88, 0x94c1, 0x46ee, 0x90, 0x76, 0x2c, 0x28, 0x81, 0x8c, 0x94, 0x81); 0x1dbc4c88, 0x94c1, 0x46ee, 0x90, 0x76, 0x2c, 0x28, 0x81, 0x8c, 0x94, 0x81);
// {E13963BC-AE51-4c5d-B00F-CFA3A9D97CE5} /* {E13963BC-AE51-4c5d-B00F-CFA3A9D97CE5} */
DEFINE_GUID(DXFILEOBJ_EffectParamDWord, DEFINE_GUID(DXFILEOBJ_EffectParamDWord,
0xe13963bc, 0xae51, 0x4c5d, 0xb0, 0xf, 0xcf, 0xa3, 0xa9, 0xd9, 0x7c, 0xe5); 0xe13963bc, 0xae51, 0x4c5d, 0xb0, 0xf, 0xcf, 0xa3, 0xa9, 0xd9, 0x7c, 0xe5);
// {E331F7E4-0559-4cc2-8E99-1CEC1657928F} /* {E331F7E4-0559-4cc2-8E99-1CEC1657928F} */
DEFINE_GUID(DXFILEOBJ_EffectInstance, DEFINE_GUID(DXFILEOBJ_EffectInstance,
0xe331f7e4, 0x559, 0x4cc2, 0x8e, 0x99, 0x1c, 0xec, 0x16, 0x57, 0x92, 0x8f); 0xe331f7e4, 0x559, 0x4cc2, 0x8e, 0x99, 0x1c, 0xec, 0x16, 0x57, 0x92, 0x8f);
// {9E415A43-7BA6-4a73-8743-B73D47E88476} /* {9E415A43-7BA6-4a73-8743-B73D47E88476} */
DEFINE_GUID(DXFILEOBJ_AnimTicksPerSecond, DEFINE_GUID(DXFILEOBJ_AnimTicksPerSecond,
0x9e415a43, 0x7ba6, 0x4a73, 0x87, 0x43, 0xb7, 0x3d, 0x47, 0xe8, 0x84, 0x76); 0x9e415a43, 0x7ba6, 0x4a73, 0x87, 0x43, 0xb7, 0x3d, 0x47, 0xe8, 0x84, 0x76);
// {7F9B00B3-F125-4890-876E-1CFFBF697C4D} /* {7F9B00B3-F125-4890-876E-1CFFBF697C4D} */
DEFINE_GUID(DXFILEOBJ_CompressedAnimationSet, DEFINE_GUID(DXFILEOBJ_CompressedAnimationSet,
0x7f9b00b3, 0xf125, 0x4890, 0x87, 0x6e, 0x1c, 0x42, 0xbf, 0x69, 0x7c, 0x4d); 0x7f9b00b3, 0xf125, 0x4890, 0x87, 0x6e, 0x1c, 0x42, 0xbf, 0x69, 0x7c, 0x4d);