ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx9: Avoid LPDIRECT3DDEVICE9.

This commit is contained in:
Henri Verbeet 2012-10-28 20:54:52 +01:00 committed by Alexandre Julliard
parent 6c26a0fa92
commit 4ba6974345
16 changed files with 329 additions and 464 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3dx9_36/d3dx9_36_main.c
View File

@ -76,7 +76,7 @@ BOOL WINAPI D3DXDebugMute(BOOL mute)
* D3DXGetDriverLevel. * D3DXGetDriverLevel.
* Returns always 900 (DX 9) for us * Returns always 900 (DX 9) for us
*/ */
UINT WINAPI D3DXGetDriverLevel(LPDIRECT3DDEVICE9 device) UINT WINAPI D3DXGetDriverLevel(struct IDirect3DDevice9 *device)
{ {
return 900; return 900;
} }

90
dlls/d3dx9_36/effect.c
View File

@ -171,9 +171,9 @@ struct ID3DXEffectImpl
ID3DXEffect ID3DXEffect_iface; ID3DXEffect ID3DXEffect_iface;
LONG ref; LONG ref;
LPD3DXEFFECTSTATEMANAGER manager; struct ID3DXEffectStateManager *manager;
LPDIRECT3DDEVICE9 device; struct IDirect3DDevice9 *device;
LPD3DXEFFECTPOOL pool; struct ID3DXEffectPool *pool;
D3DXHANDLE active_technique; D3DXHANDLE active_technique;
D3DXHANDLE active_pass; D3DXHANDLE active_pass;
@ -3570,7 +3570,7 @@ static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect* iface)
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI ID3DXEffectImpl_GetDevice(ID3DXEffect *iface, LPDIRECT3DDEVICE9 *device) static HRESULT WINAPI ID3DXEffectImpl_GetDevice(ID3DXEffect *iface, struct IDirect3DDevice9 **device)
{ {
struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface);
@ -3677,7 +3677,8 @@ static HRESULT WINAPI ID3DXEffectImpl_DeleteParameterBlock(ID3DXEffect* iface, D
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect* iface, LPDIRECT3DDEVICE9 device, LPD3DXEFFECT* effect) static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface,
struct IDirect3DDevice9 *device, struct ID3DXEffect **effect)
{ {
struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface);
@ -4716,7 +4717,7 @@ static HRESULT d3dx9_copy_data(char **str, const char **ptr)
return D3D_OK; return D3D_OK;
} }
static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr, LPDIRECT3DDEVICE9 device) static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr, struct IDirect3DDevice9 *device)
{ {
DWORD size; DWORD size;
HRESULT hr; HRESULT hr;
@ -5729,8 +5730,8 @@ static HRESULT d3dx9_base_effect_init(struct ID3DXBaseEffectImpl *base,
return D3D_OK; return D3D_OK;
} }
static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, LPDIRECT3DDEVICE9 device, static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, struct IDirect3DDevice9 *device,
const char *data, SIZE_T data_size, LPD3DXEFFECTPOOL pool) const char *data, SIZE_T data_size, struct ID3DXEffectPool *pool)
{ {
HRESULT hr; HRESULT hr;
struct ID3DXBaseEffectImpl *object = NULL; struct ID3DXBaseEffectImpl *object = NULL;
@ -5780,16 +5781,9 @@ err_out:
return hr; return hr;
} }
HRESULT WINAPI D3DXCreateEffectEx(LPDIRECT3DDEVICE9 device, HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *srcdata, UINT srcdatalen,
LPCVOID srcdata, const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skip_constants, DWORD flags,
UINT srcdatalen, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors)
CONST D3DXMACRO* defines,
LPD3DXINCLUDE include,
LPCSTR skip_constants,
DWORD flags,
LPD3DXEFFECTPOOL pool,
LPD3DXEFFECT* effect,
LPD3DXBUFFER* compilation_errors)
{ {
struct ID3DXEffectImpl *object; struct ID3DXEffectImpl *object;
HRESULT hr; HRESULT hr;
@ -5829,15 +5823,9 @@ HRESULT WINAPI D3DXCreateEffectEx(LPDIRECT3DDEVICE9 device,
return D3D_OK; return D3D_OK;
} }
HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device, HRESULT WINAPI D3DXCreateEffect(struct IDirect3DDevice9 *device, const void *srcdata, UINT srcdatalen,
LPCVOID srcdata, const D3DXMACRO *defines, struct ID3DXInclude *include, DWORD flags,
UINT srcdatalen, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors)
CONST D3DXMACRO* defines,
LPD3DXINCLUDE include,
DWORD flags,
LPD3DXEFFECTPOOL pool,
LPD3DXEFFECT* effect,
LPD3DXBUFFER* compilation_errors)
{ {
TRACE("(%p, %p, %u, %p, %p, %#x, %p, %p, %p): Forwarded to D3DXCreateEffectEx\n", device, srcdata, srcdatalen, defines, TRACE("(%p, %p, %u, %p, %p, %#x, %p, %p, %p): Forwarded to D3DXCreateEffectEx\n", device, srcdata, srcdatalen, defines,
include, flags, pool, effect, compilation_errors); include, flags, pool, effect, compilation_errors);
@ -6009,9 +5997,9 @@ HRESULT WINAPI D3DXCreateEffectPool(LPD3DXEFFECTPOOL *pool)
return S_OK; return S_OK;
} }
HRESULT WINAPI D3DXCreateEffectFromFileExW(LPDIRECT3DDEVICE9 device, LPCWSTR srcfile, HRESULT WINAPI D3DXCreateEffectFromFileExW(struct IDirect3DDevice9 *device, const WCHAR *srcfile,
const D3DXMACRO *defines, LPD3DXINCLUDE include, LPCSTR skipconstants, DWORD flags, const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skipconstants, DWORD flags,
LPD3DXEFFECTPOOL pool, LPD3DXEFFECT *effect, LPD3DXBUFFER *compilationerrors) struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilationerrors)
{ {
LPVOID buffer; LPVOID buffer;
HRESULT ret; HRESULT ret;
@ -6033,9 +6021,9 @@ HRESULT WINAPI D3DXCreateEffectFromFileExW(LPDIRECT3DDEVICE9 device, LPCWSTR src
return ret; return ret;
} }
HRESULT WINAPI D3DXCreateEffectFromFileExA(LPDIRECT3DDEVICE9 device, LPCSTR srcfile, HRESULT WINAPI D3DXCreateEffectFromFileExA(struct IDirect3DDevice9 *device, const char *srcfile,
const D3DXMACRO *defines, LPD3DXINCLUDE include, LPCSTR skipconstants, DWORD flags, const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skipconstants, DWORD flags,
LPD3DXEFFECTPOOL pool, LPD3DXEFFECT *effect, LPD3DXBUFFER *compilationerrors) struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilationerrors)
{ {
LPWSTR srcfileW; LPWSTR srcfileW;
HRESULT ret; HRESULT ret;
@ -6056,25 +6044,25 @@ HRESULT WINAPI D3DXCreateEffectFromFileExA(LPDIRECT3DDEVICE9 device, LPCSTR srcf
return ret; return ret;
} }
HRESULT WINAPI D3DXCreateEffectFromFileW(LPDIRECT3DDEVICE9 device, LPCWSTR srcfile, HRESULT WINAPI D3DXCreateEffectFromFileW(struct IDirect3DDevice9 *device, const WCHAR *srcfile,
const D3DXMACRO *defines, LPD3DXINCLUDE include, DWORD flags, LPD3DXEFFECTPOOL pool, const D3DXMACRO *defines, struct ID3DXInclude *include, DWORD flags, struct ID3DXEffectPool *pool,
LPD3DXEFFECT *effect, LPD3DXBUFFER *compilationerrors) struct ID3DXEffect **effect, struct ID3DXBuffer **compilationerrors)
{ {
TRACE("(void): relay\n"); TRACE("(void): relay\n");
return D3DXCreateEffectFromFileExW(device, srcfile, defines, include, NULL, flags, pool, effect, compilationerrors); return D3DXCreateEffectFromFileExW(device, srcfile, defines, include, NULL, flags, pool, effect, compilationerrors);
} }
HRESULT WINAPI D3DXCreateEffectFromFileA(LPDIRECT3DDEVICE9 device, LPCSTR srcfile, HRESULT WINAPI D3DXCreateEffectFromFileA(struct IDirect3DDevice9 *device, const char *srcfile,
const D3DXMACRO *defines, LPD3DXINCLUDE include, DWORD flags, LPD3DXEFFECTPOOL pool, const D3DXMACRO *defines, struct ID3DXInclude *include, DWORD flags, struct ID3DXEffectPool *pool,
LPD3DXEFFECT *effect, LPD3DXBUFFER *compilationerrors) struct ID3DXEffect **effect, struct ID3DXBuffer **compilationerrors)
{ {
TRACE("(void): relay\n"); TRACE("(void): relay\n");
return D3DXCreateEffectFromFileExA(device, srcfile, defines, include, NULL, flags, pool, effect, compilationerrors); return D3DXCreateEffectFromFileExA(device, srcfile, defines, include, NULL, flags, pool, effect, compilationerrors);
} }
HRESULT WINAPI D3DXCreateEffectFromResourceExW(LPDIRECT3DDEVICE9 device, HMODULE srcmodule, LPCWSTR srcresource, HRESULT WINAPI D3DXCreateEffectFromResourceExW(struct IDirect3DDevice9 *device, HMODULE srcmodule,
const D3DXMACRO *defines, LPD3DXINCLUDE include, LPCSTR skipconstants, DWORD flags, const WCHAR *srcresource, const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skipconstants,
LPD3DXEFFECTPOOL pool, LPD3DXEFFECT *effect, LPD3DXBUFFER *compilationerrors) DWORD flags, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilationerrors)
{ {
HRSRC resinfo; HRSRC resinfo;
@ -6102,9 +6090,9 @@ HRESULT WINAPI D3DXCreateEffectFromResourceExW(LPDIRECT3DDEVICE9 device, HMODULE
return D3DXERR_INVALIDDATA; return D3DXERR_INVALIDDATA;
} }
HRESULT WINAPI D3DXCreateEffectFromResourceExA(LPDIRECT3DDEVICE9 device, HMODULE srcmodule, LPCSTR srcresource, HRESULT WINAPI D3DXCreateEffectFromResourceExA(struct IDirect3DDevice9 *device, HMODULE srcmodule,
const D3DXMACRO *defines, LPD3DXINCLUDE include, LPCSTR skipconstants, DWORD flags, const char *srcresource, const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skipconstants,
LPD3DXEFFECTPOOL pool, LPD3DXEFFECT *effect, LPD3DXBUFFER *compilationerrors) DWORD flags, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilationerrors)
{ {
HRSRC resinfo; HRSRC resinfo;
@ -6132,17 +6120,17 @@ HRESULT WINAPI D3DXCreateEffectFromResourceExA(LPDIRECT3DDEVICE9 device, HMODULE
return D3DXERR_INVALIDDATA; return D3DXERR_INVALIDDATA;
} }
HRESULT WINAPI D3DXCreateEffectFromResourceW(LPDIRECT3DDEVICE9 device, HMODULE srcmodule, LPCWSTR srcresource, HRESULT WINAPI D3DXCreateEffectFromResourceW(struct IDirect3DDevice9 *device, HMODULE srcmodule,
const D3DXMACRO *defines, LPD3DXINCLUDE include, DWORD flags, LPD3DXEFFECTPOOL pool, const WCHAR *srcresource, const D3DXMACRO *defines, struct ID3DXInclude *include, DWORD flags,
LPD3DXEFFECT *effect, LPD3DXBUFFER *compilationerrors) struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilationerrors)
{ {
TRACE("(void): relay\n"); TRACE("(void): relay\n");
return D3DXCreateEffectFromResourceExW(device, srcmodule, srcresource, defines, include, NULL, flags, pool, effect, compilationerrors); return D3DXCreateEffectFromResourceExW(device, srcmodule, srcresource, defines, include, NULL, flags, pool, effect, compilationerrors);
} }
HRESULT WINAPI D3DXCreateEffectFromResourceA(LPDIRECT3DDEVICE9 device, HMODULE srcmodule, LPCSTR srcresource, HRESULT WINAPI D3DXCreateEffectFromResourceA(struct IDirect3DDevice9 *device, HMODULE srcmodule,
const D3DXMACRO *defines, LPD3DXINCLUDE include, DWORD flags, LPD3DXEFFECTPOOL pool, const char *srcresource, const D3DXMACRO *defines, struct ID3DXInclude *include, DWORD flags,
LPD3DXEFFECT *effect, LPD3DXBUFFER *compilationerrors) struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilationerrors)
{ {
TRACE("(void): relay\n"); TRACE("(void): relay\n");
return D3DXCreateEffectFromResourceExA(device, srcmodule, srcresource, defines, include, NULL, flags, pool, effect, compilationerrors); return D3DXCreateEffectFromResourceExA(device, srcmodule, srcresource, defines, include, NULL, flags, pool, effect, compilationerrors);

5
dlls/d3dx9_36/font.c
View File

@ -228,8 +228,9 @@ static const ID3DXFontVtbl D3DXFont_Vtbl =
ID3DXFontImpl_OnResetDevice ID3DXFontImpl_OnResetDevice
}; };
HRESULT WINAPI D3DXCreateFontA(LPDIRECT3DDEVICE9 device, INT height, UINT width, UINT weight, UINT miplevels, BOOL italic, DWORD charset, HRESULT WINAPI D3DXCreateFontA(struct IDirect3DDevice9 *device, INT height, UINT width,
DWORD precision, DWORD quality, DWORD pitchandfamily, LPCSTR facename, LPD3DXFONT *font) UINT weight, UINT miplevels, BOOL italic, DWORD charset, DWORD precision, DWORD quality,
DWORD pitchandfamily, const char *facename, struct ID3DXFont **font)
{ {
D3DXFONT_DESCA desc; D3DXFONT_DESCA desc;

4
dlls/d3dx9_36/line.c
View File

@ -81,7 +81,7 @@ static ULONG WINAPI ID3DXLineImpl_Release(ID3DXLine* iface)
} }
/*** ID3DXLine methods ***/ /*** ID3DXLine methods ***/
static HRESULT WINAPI ID3DXLineImpl_GetDevice(ID3DXLine* iface, LPDIRECT3DDEVICE9* device) static HRESULT WINAPI ID3DXLineImpl_GetDevice(struct ID3DXLine *iface, struct IDirect3DDevice9 **device)
{ {
ID3DXLineImpl *This = impl_from_ID3DXLine(iface); ID3DXLineImpl *This = impl_from_ID3DXLine(iface);
@ -328,7 +328,7 @@ static const struct ID3DXLineVtbl ID3DXLine_Vtbl =
ID3DXLineImpl_OnResetDevice ID3DXLineImpl_OnResetDevice
}; };
HRESULT WINAPI D3DXCreateLine(LPDIRECT3DDEVICE9 device, LPD3DXLINE* line) HRESULT WINAPI D3DXCreateLine(struct IDirect3DDevice9 *device, struct ID3DXLine **line)
{ {
ID3DXLineImpl* object; ID3DXLineImpl* object;

160
dlls/d3dx9_36/mesh.c
View File

@ -255,7 +255,7 @@ static DWORD WINAPI ID3DXMeshImpl_GetOptions(ID3DXMesh *iface)
return This->options; return This->options;
} }
static HRESULT WINAPI ID3DXMeshImpl_GetDevice(ID3DXMesh *iface, LPDIRECT3DDEVICE9 *device) static HRESULT WINAPI ID3DXMeshImpl_GetDevice(struct ID3DXMesh *iface, struct IDirect3DDevice9 **device)
{ {
ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface);
@ -268,7 +268,8 @@ static HRESULT WINAPI ID3DXMeshImpl_GetDevice(ID3DXMesh *iface, LPDIRECT3DDEVICE
return D3D_OK; return D3D_OK;
} }
static HRESULT WINAPI ID3DXMeshImpl_CloneMeshFVF(ID3DXMesh *iface, DWORD options, DWORD fvf, LPDIRECT3DDEVICE9 device, LPD3DXMESH *clone_mesh) static HRESULT WINAPI ID3DXMeshImpl_CloneMeshFVF(struct ID3DXMesh *iface, DWORD options, DWORD fvf,
struct IDirect3DDevice9 *device, struct ID3DXMesh **clone_mesh)
{ {
ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface);
HRESULT hr; HRESULT hr;
@ -675,8 +676,8 @@ static BOOL declaration_equals(CONST D3DVERTEXELEMENT9 *declaration1, CONST D3DV
return FALSE; return FALSE;
} }
static HRESULT WINAPI ID3DXMeshImpl_CloneMesh(ID3DXMesh *iface, DWORD options, CONST D3DVERTEXELEMENT9 *declaration, LPDIRECT3DDEVICE9 device, static HRESULT WINAPI ID3DXMeshImpl_CloneMesh(struct ID3DXMesh *iface, DWORD options,
LPD3DXMESH *clone_mesh_out) const D3DVERTEXELEMENT9 *declaration, struct IDirect3DDevice9 *device, struct ID3DXMesh **clone_mesh_out)
{ {
ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface);
ID3DXMeshImpl *cloned_this; ID3DXMeshImpl *cloned_this;
@ -2431,8 +2432,8 @@ BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *pcenter, FLOAT radius, CONST
/************************************************************************* /*************************************************************************
* D3DXCreateMesh * D3DXCreateMesh
*/ */
HRESULT WINAPI D3DXCreateMesh(DWORD numfaces, DWORD numvertices, DWORD options, CONST D3DVERTEXELEMENT9 *declaration, HRESULT WINAPI D3DXCreateMesh(DWORD numfaces, DWORD numvertices, DWORD options,
LPDIRECT3DDEVICE9 device, LPD3DXMESH *mesh) const D3DVERTEXELEMENT9 *declaration, struct IDirect3DDevice9 *device, struct ID3DXMesh **mesh)
{ {
HRESULT hr; HRESULT hr;
DWORD fvf; DWORD fvf;
@ -2593,8 +2594,8 @@ HRESULT WINAPI D3DXCreateMesh(DWORD numfaces, DWORD numvertices, DWORD options,
/************************************************************************* /*************************************************************************
* D3DXCreateMeshFVF * D3DXCreateMeshFVF
*/ */
HRESULT WINAPI D3DXCreateMeshFVF(DWORD numfaces, DWORD numvertices, DWORD options, DWORD fvf, HRESULT WINAPI D3DXCreateMeshFVF(DWORD numfaces, DWORD numvertices, DWORD options,
LPDIRECT3DDEVICE9 device, LPD3DXMESH *mesh) DWORD fvf, struct IDirect3DDevice9 *device, struct ID3DXMesh **mesh)
{ {
HRESULT hr; HRESULT hr;
D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]; D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE];
@ -3274,15 +3275,10 @@ static HRESULT generate_effects(ID3DXBuffer *materials, DWORD num_materials,
} }
/* change to D3DXLoadSkinMeshFromXof when ID3DXFileData is implemented */ /* change to D3DXLoadSkinMeshFromXof when ID3DXFileData is implemented */
static HRESULT load_skin_mesh_from_xof(IDirectXFileData *filedata, static HRESULT load_skin_mesh_from_xof(struct IDirectXFileData *filedata, DWORD options,
DWORD options, struct IDirect3DDevice9 *device, struct ID3DXBuffer **adjacency_out, struct ID3DXBuffer **materials_out,
LPDIRECT3DDEVICE9 device, struct ID3DXBuffer **effects_out, DWORD *num_materials_out, struct ID3DXSkinInfo **skin_info_out,
LPD3DXBUFFER *adjacency_out, struct ID3DXMesh **mesh_out)
LPD3DXBUFFER *materials_out,
LPD3DXBUFFER *effects_out,
DWORD *num_materials_out,
LPD3DXSKININFO *skin_info_out,
LPD3DXMESH *mesh_out)
{ {
HRESULT hr; HRESULT hr;
DWORD *index_in_ptr; DWORD *index_in_ptr;
@ -3518,13 +3514,9 @@ cleanup:
return hr; return hr;
} }
HRESULT WINAPI D3DXLoadMeshHierarchyFromXA(LPCSTR filename, HRESULT WINAPI D3DXLoadMeshHierarchyFromXA(const char *filename, DWORD options, struct IDirect3DDevice9 *device,
DWORD options, struct ID3DXAllocateHierarchy *alloc_hier, struct ID3DXLoadUserData *load_user_data,
LPDIRECT3DDEVICE9 device, D3DXFRAME **frame_hierarchy, struct ID3DXAnimationController **anim_controller)
LPD3DXALLOCATEHIERARCHY alloc_hier,
LPD3DXLOADUSERDATA load_user_data,
LPD3DXFRAME *frame_hierarchy,
LPD3DXANIMATIONCONTROLLER *anim_controller)
{ {
HRESULT hr; HRESULT hr;
int len; int len;
@ -3548,13 +3540,9 @@ HRESULT WINAPI D3DXLoadMeshHierarchyFromXA(LPCSTR filename,
return hr; return hr;
} }
HRESULT WINAPI D3DXLoadMeshHierarchyFromXW(LPCWSTR filename, HRESULT WINAPI D3DXLoadMeshHierarchyFromXW(const WCHAR *filename, DWORD options, struct IDirect3DDevice9 *device,
DWORD options, struct ID3DXAllocateHierarchy *alloc_hier, struct ID3DXLoadUserData *load_user_data,
LPDIRECT3DDEVICE9 device, D3DXFRAME **frame_hierarchy, struct ID3DXAnimationController **anim_controller)
LPD3DXALLOCATEHIERARCHY alloc_hier,
LPD3DXLOADUSERDATA load_user_data,
LPD3DXFRAME *frame_hierarchy,
LPD3DXANIMATIONCONTROLLER *anim_controller)
{ {
HRESULT hr; HRESULT hr;
DWORD size; DWORD size;
@ -3600,11 +3588,8 @@ static HRESULT filedata_get_name(IDirectXFileData *filedata, char **name)
return hr; return hr;
} }
static HRESULT load_mesh_container(IDirectXFileData *filedata, static HRESULT load_mesh_container(struct IDirectXFileData *filedata, DWORD options, struct IDirect3DDevice9 *device,
DWORD options, struct ID3DXAllocateHierarchy *alloc_hier, D3DXMESHCONTAINER **mesh_container)
LPDIRECT3DDEVICE9 device,
LPD3DXALLOCATEHIERARCHY alloc_hier,
D3DXMESHCONTAINER **mesh_container)
{ {
HRESULT hr; HRESULT hr;
ID3DXBuffer *adjacency = NULL; ID3DXBuffer *adjacency = NULL;
@ -3670,11 +3655,8 @@ static HRESULT parse_transform_matrix(IDirectXFileData *filedata, D3DXMATRIX *tr
return D3D_OK; return D3D_OK;
} }
static HRESULT load_frame(IDirectXFileData *filedata, static HRESULT load_frame(struct IDirectXFileData *filedata, DWORD options, struct IDirect3DDevice9 *device,
DWORD options, struct ID3DXAllocateHierarchy *alloc_hier, D3DXFRAME **frame_out)
LPDIRECT3DDEVICE9 device,
LPD3DXALLOCATEHIERARCHY alloc_hier,
D3DXFRAME **frame_out)
{ {
HRESULT hr; HRESULT hr;
const GUID *type; const GUID *type;
@ -3717,14 +3699,10 @@ static HRESULT load_frame(IDirectXFileData *filedata,
return hr; return hr;
} }
HRESULT WINAPI D3DXLoadMeshHierarchyFromXInMemory(LPCVOID memory, HRESULT WINAPI D3DXLoadMeshHierarchyFromXInMemory(const void *memory, DWORD memory_size, DWORD options,
DWORD memory_size, struct IDirect3DDevice9 *device, struct ID3DXAllocateHierarchy *alloc_hier,
DWORD options, struct ID3DXLoadUserData *load_user_data, D3DXFRAME **frame_hierarchy,
LPDIRECT3DDEVICE9 device, struct ID3DXAnimationController **anim_controller)
LPD3DXALLOCATEHIERARCHY alloc_hier,
LPD3DXLOADUSERDATA load_user_data,
LPD3DXFRAME *frame_hierarchy,
LPD3DXANIMATIONCONTROLLER *anim_controller)
{ {
HRESULT hr; HRESULT hr;
IDirectXFile *dxfile = NULL; IDirectXFile *dxfile = NULL;
@ -3867,14 +3845,9 @@ HRESULT WINAPI D3DXFrameDestroy(LPD3DXFRAME frame, LPD3DXALLOCATEHIERARCHY alloc
return D3D_OK; return D3D_OK;
} }
HRESULT WINAPI D3DXLoadMeshFromXA(LPCSTR filename, HRESULT WINAPI D3DXLoadMeshFromXA(const char *filename, DWORD options, struct IDirect3DDevice9 *device,
DWORD options, struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances,
LPDIRECT3DDEVICE9 device, DWORD *num_materials, struct ID3DXMesh **mesh)
LPD3DXBUFFER *adjacency,
LPD3DXBUFFER *materials,
LPD3DXBUFFER *effect_instances,
DWORD *num_materials,
LPD3DXMESH *mesh)
{ {
HRESULT hr; HRESULT hr;
int len; int len;
@ -3898,14 +3871,9 @@ HRESULT WINAPI D3DXLoadMeshFromXA(LPCSTR filename,
return hr; return hr;
} }
HRESULT WINAPI D3DXLoadMeshFromXW(LPCWSTR filename, HRESULT WINAPI D3DXLoadMeshFromXW(const WCHAR *filename, DWORD options, struct IDirect3DDevice9 *device,
DWORD options, struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances,
LPDIRECT3DDEVICE9 device, DWORD *num_materials, struct ID3DXMesh **mesh)
LPD3DXBUFFER *adjacency,
LPD3DXBUFFER *materials,
LPD3DXBUFFER *effect_instances,
DWORD *num_materials,
LPD3DXMESH *mesh)
{ {
HRESULT hr; HRESULT hr;
DWORD size; DWORD size;
@ -3929,16 +3897,9 @@ HRESULT WINAPI D3DXLoadMeshFromXW(LPCWSTR filename,
return hr; return hr;
} }
HRESULT WINAPI D3DXLoadMeshFromXResource(HMODULE module, HRESULT WINAPI D3DXLoadMeshFromXResource(HMODULE module, const char *name, const char *type, DWORD options,
LPCSTR name, struct IDirect3DDevice9 *device, struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials,
LPCSTR type, struct ID3DXBuffer **effect_instances, DWORD *num_materials, struct ID3DXMesh **mesh)
DWORD options,
LPDIRECT3DDEVICE9 device,
LPD3DXBUFFER *adjacency,
LPD3DXBUFFER *materials,
LPD3DXBUFFER *effect_instances,
DWORD *num_materials,
LPD3DXMESH *mesh)
{ {
HRESULT hr; HRESULT hr;
HRSRC resinfo; HRSRC resinfo;
@ -3970,12 +3931,8 @@ struct mesh_container
D3DXMATRIX transform; D3DXMATRIX transform;
}; };
static HRESULT parse_frame(IDirectXFileData *filedata, static HRESULT parse_frame(struct IDirectXFileData *filedata, DWORD options, struct IDirect3DDevice9 *device,
DWORD options, const D3DXMATRIX *parent_transform, struct list *container_list, DWORD provide_flags)
LPDIRECT3DDEVICE9 device,
const D3DXMATRIX *parent_transform,
struct list *container_list,
DWORD provide_flags)
{ {
HRESULT hr; HRESULT hr;
D3DXMATRIX transform = *parent_transform; D3DXMATRIX transform = *parent_transform;
@ -4009,15 +3966,9 @@ static HRESULT parse_frame(IDirectXFileData *filedata,
return hr == DXFILEERR_NOMOREOBJECTS ? D3D_OK : hr; return hr == DXFILEERR_NOMOREOBJECTS ? D3D_OK : hr;
} }
HRESULT WINAPI D3DXLoadMeshFromXInMemory(LPCVOID memory, HRESULT WINAPI D3DXLoadMeshFromXInMemory(const void *memory, DWORD memory_size, DWORD options,
DWORD memory_size, struct IDirect3DDevice9 *device, struct ID3DXBuffer **adjacency_out, struct ID3DXBuffer **materials_out,
DWORD options, struct ID3DXBuffer **effects_out, DWORD *num_materials_out, struct ID3DXMesh **mesh_out)
LPDIRECT3DDEVICE9 device,
LPD3DXBUFFER *adjacency_out,
LPD3DXBUFFER *materials_out,
LPD3DXBUFFER *effects_out,
DWORD *num_materials_out,
LPD3DXMESH *mesh_out)
{ {
HRESULT hr; HRESULT hr;
IDirectXFile *dxfile = NULL; IDirectXFile *dxfile = NULL;
@ -4365,8 +4316,8 @@ cleanup:
return hr; return hr;
} }
HRESULT WINAPI D3DXCreateBox(LPDIRECT3DDEVICE9 device, FLOAT width, FLOAT height, HRESULT WINAPI D3DXCreateBox(struct IDirect3DDevice9 *device, float width, float height,
FLOAT depth, LPD3DXMESH* mesh, LPD3DXBUFFER* adjacency) float depth, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency)
{ {
FIXME("(%p, %f, %f, %f, %p, %p): stub\n", device, width, height, depth, mesh, adjacency); FIXME("(%p, %f, %f, %f, %p, %p): stub\n", device, width, height, depth, mesh, adjacency);
@ -4427,8 +4378,8 @@ static WORD vertex_index(UINT slices, int slice, int stack)
return stack*slices+slice+1; return stack*slices+slice+1;
} }
HRESULT WINAPI D3DXCreateSphere(LPDIRECT3DDEVICE9 device, FLOAT radius, UINT slices, HRESULT WINAPI D3DXCreateSphere(struct IDirect3DDevice9 *device, float radius, UINT slices,
UINT stacks, LPD3DXMESH* mesh, LPD3DXBUFFER* adjacency) UINT stacks, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency)
{ {
DWORD number_of_vertices, number_of_faces; DWORD number_of_vertices, number_of_faces;
HRESULT hr; HRESULT hr;
@ -4598,8 +4549,8 @@ HRESULT WINAPI D3DXCreateSphere(LPDIRECT3DDEVICE9 device, FLOAT radius, UINT sli
return D3D_OK; return D3D_OK;
} }
HRESULT WINAPI D3DXCreateCylinder(LPDIRECT3DDEVICE9 device, FLOAT radius1, FLOAT radius2, FLOAT length, UINT slices, HRESULT WINAPI D3DXCreateCylinder(struct IDirect3DDevice9 *device, float radius1, float radius2,
UINT stacks, LPD3DXMESH* mesh, LPD3DXBUFFER* adjacency) float length, UINT slices, UINT stacks, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency)
{ {
DWORD number_of_vertices, number_of_faces; DWORD number_of_vertices, number_of_faces;
HRESULT hr; HRESULT hr;
@ -4784,18 +4735,16 @@ HRESULT WINAPI D3DXCreateCylinder(LPDIRECT3DDEVICE9 device, FLOAT radius1, FLOAT
return D3D_OK; return D3D_OK;
} }
HRESULT WINAPI D3DXCreateTeapot(LPDIRECT3DDEVICE9 device, LPD3DXMESH *mesh, LPD3DXBUFFER* adjacency) HRESULT WINAPI D3DXCreateTeapot(struct IDirect3DDevice9 *device,
struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency)
{ {
FIXME("(%p, %p, %p): stub\n", device, mesh, adjacency); FIXME("(%p, %p, %p): stub\n", device, mesh, adjacency);
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT WINAPI D3DXCreateTextA(LPDIRECT3DDEVICE9 device, HRESULT WINAPI D3DXCreateTextA(struct IDirect3DDevice9 *device, HDC hdc, const char *text, float deviation,
HDC hdc, LPCSTR text, float extrusion, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency, GLYPHMETRICSFLOAT *glyphmetrics)
FLOAT deviation, FLOAT extrusion,
LPD3DXMESH *mesh, LPD3DXBUFFER *adjacency,
LPGLYPHMETRICSFLOAT glyphmetrics)
{ {
HRESULT hr; HRESULT hr;
int len; int len;
@ -5600,11 +5549,8 @@ static HRESULT triangulate(struct triangulation_array *triangulations)
return S_OK; return S_OK;
} }
HRESULT WINAPI D3DXCreateTextW(LPDIRECT3DDEVICE9 device, HRESULT WINAPI D3DXCreateTextW(struct IDirect3DDevice9 *device, HDC hdc, const WCHAR *text, float deviation,
HDC hdc, LPCWSTR text, float extrusion, struct ID3DXMesh **mesh_ptr, struct ID3DXBuffer **adjacency, GLYPHMETRICSFLOAT *glyphmetrics)
FLOAT deviation, FLOAT extrusion,
LPD3DXMESH *mesh_ptr, LPD3DXBUFFER *adjacency,
LPGLYPHMETRICSFLOAT glyphmetrics)
{ {
HRESULT hr; HRESULT hr;
ID3DXMesh *mesh = NULL; ID3DXMesh *mesh = NULL;

66
dlls/d3dx9_36/shader.c
View File

@ -40,7 +40,7 @@ HRESULT WINAPI D3DAssemble(LPCVOID data, SIZE_T datasize, LPCSTR filename,
UINT flags, UINT flags,
ID3DBlob **shader, ID3DBlob **error_messages); ID3DBlob **shader, ID3DBlob **error_messages);
LPCSTR WINAPI D3DXGetPixelShaderProfile(LPDIRECT3DDEVICE9 device) const char * WINAPI D3DXGetPixelShaderProfile(struct IDirect3DDevice9 *device)
{ {
D3DCAPS9 caps; D3DCAPS9 caps;
@ -118,7 +118,7 @@ DWORD WINAPI D3DXGetShaderVersion(const DWORD *byte_code)
return byte_code ? *byte_code : 0; return byte_code ? *byte_code : 0;
} }
LPCSTR WINAPI D3DXGetVertexShaderProfile(LPDIRECT3DDEVICE9 device) const char * WINAPI D3DXGetVertexShaderProfile(struct IDirect3DDevice9 *device)
{ {
D3DCAPS9 caps; D3DCAPS9 caps;
@ -1321,7 +1321,8 @@ static HRESULT set_matrix_pointer_array(ID3DXConstantTable *iface, IDirect3DDevi
return D3D_OK; return D3D_OK;
} }
static HRESULT WINAPI ID3DXConstantTableImpl_SetDefaults(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device) static HRESULT WINAPI ID3DXConstantTableImpl_SetDefaults(struct ID3DXConstantTable *iface,
struct IDirect3DDevice9 *device)
{ {
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
UINT i; UINT i;
@ -1344,8 +1345,8 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetDefaults(ID3DXConstantTable *ifa
return D3D_OK; return D3D_OK;
} }
static HRESULT WINAPI ID3DXConstantTableImpl_SetValue(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, static HRESULT WINAPI ID3DXConstantTableImpl_SetValue(struct ID3DXConstantTable *iface,
D3DXHANDLE constant, LPCVOID data, UINT bytes) struct IDirect3DDevice9 *device, D3DXHANDLE constant, const void *data, UINT bytes)
{ {
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
HRESULT hr; HRESULT hr;
@ -1380,8 +1381,8 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetValue(ID3DXConstantTable *iface,
} }
} }
static HRESULT WINAPI ID3DXConstantTableImpl_SetBool(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, static HRESULT WINAPI ID3DXConstantTableImpl_SetBool(struct ID3DXConstantTable *iface,
D3DXHANDLE constant, BOOL b) struct IDirect3DDevice9 *device, D3DXHANDLE constant, BOOL b)
{ {
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
@ -1390,8 +1391,8 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetBool(ID3DXConstantTable *iface,
return set_scalar_array(iface, device, constant, &b, 1, D3DXPT_BOOL); return set_scalar_array(iface, device, constant, &b, 1, D3DXPT_BOOL);
} }
static HRESULT WINAPI ID3DXConstantTableImpl_SetBoolArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, static HRESULT WINAPI ID3DXConstantTableImpl_SetBoolArray(struct ID3DXConstantTable *iface,
D3DXHANDLE constant, CONST BOOL* b, UINT count) struct IDirect3DDevice9 *device, D3DXHANDLE constant, const BOOL *b, UINT count)
{ {
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
@ -1400,7 +1401,8 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetBoolArray(ID3DXConstantTable *if
return set_scalar_array(iface, device, constant, b, count, D3DXPT_BOOL); return set_scalar_array(iface, device, constant, b, count, D3DXPT_BOOL);
} }
static HRESULT WINAPI ID3DXConstantTableImpl_SetInt(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, D3DXHANDLE constant, INT n) static HRESULT WINAPI ID3DXConstantTableImpl_SetInt(struct ID3DXConstantTable *iface,
struct IDirect3DDevice9 *device, D3DXHANDLE constant, INT n)
{ {
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
@ -1409,8 +1411,8 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetInt(ID3DXConstantTable *iface, L
return set_scalar_array(iface, device, constant, &n, 1, D3DXPT_INT); return set_scalar_array(iface, device, constant, &n, 1, D3DXPT_INT);
} }
static HRESULT WINAPI ID3DXConstantTableImpl_SetIntArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, static HRESULT WINAPI ID3DXConstantTableImpl_SetIntArray(struct ID3DXConstantTable *iface,
D3DXHANDLE constant, CONST INT* n, UINT count) struct IDirect3DDevice9 *device, D3DXHANDLE constant, const INT *n, UINT count)
{ {
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
@ -1419,8 +1421,8 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetIntArray(ID3DXConstantTable *ifa
return set_scalar_array(iface, device, constant, n, count, D3DXPT_INT); return set_scalar_array(iface, device, constant, n, count, D3DXPT_INT);
} }
static HRESULT WINAPI ID3DXConstantTableImpl_SetFloat(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, static HRESULT WINAPI ID3DXConstantTableImpl_SetFloat(struct ID3DXConstantTable *iface,
D3DXHANDLE constant, FLOAT f) struct IDirect3DDevice9 *device, D3DXHANDLE constant, float f)
{ {
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
@ -1429,8 +1431,8 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetFloat(ID3DXConstantTable *iface,
return set_scalar_array(iface, device, constant, &f, 1, D3DXPT_FLOAT); return set_scalar_array(iface, device, constant, &f, 1, D3DXPT_FLOAT);
} }
static HRESULT WINAPI ID3DXConstantTableImpl_SetFloatArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, static HRESULT WINAPI ID3DXConstantTableImpl_SetFloatArray(struct ID3DXConstantTable *iface,
D3DXHANDLE constant, CONST FLOAT *f, UINT count) struct IDirect3DDevice9 *device, D3DXHANDLE constant, const float *f, UINT count)
{ {
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
@ -1439,8 +1441,8 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetFloatArray(ID3DXConstantTable *i
return set_scalar_array(iface, device, constant, f, count, D3DXPT_FLOAT); return set_scalar_array(iface, device, constant, f, count, D3DXPT_FLOAT);
} }
static HRESULT WINAPI ID3DXConstantTableImpl_SetVector(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, static HRESULT WINAPI ID3DXConstantTableImpl_SetVector(struct ID3DXConstantTable *iface,
D3DXHANDLE constant, CONST D3DXVECTOR4 *vector) struct IDirect3DDevice9 *device, D3DXHANDLE constant, const D3DXVECTOR4 *vector)
{ {
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
@ -1449,8 +1451,8 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetVector(ID3DXConstantTable *iface
return set_vector_array(iface, device, constant, vector, 1, D3DXPT_FLOAT); return set_vector_array(iface, device, constant, vector, 1, D3DXPT_FLOAT);
} }
static HRESULT WINAPI ID3DXConstantTableImpl_SetVectorArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, static HRESULT WINAPI ID3DXConstantTableImpl_SetVectorArray(struct ID3DXConstantTable *iface,
D3DXHANDLE constant, CONST D3DXVECTOR4 *vector, UINT count) struct IDirect3DDevice9 *device, D3DXHANDLE constant, const D3DXVECTOR4 *vector, UINT count)
{ {
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
@ -1459,8 +1461,8 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetVectorArray(ID3DXConstantTable *
return set_vector_array(iface, device, constant, vector, count, D3DXPT_FLOAT); return set_vector_array(iface, device, constant, vector, count, D3DXPT_FLOAT);
} }
static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrix(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrix(struct ID3DXConstantTable *iface,
D3DXHANDLE constant, CONST D3DXMATRIX *matrix) struct IDirect3DDevice9 *device, D3DXHANDLE constant, const D3DXMATRIX *matrix)
{ {
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
@ -1469,8 +1471,8 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrix(ID3DXConstantTable *iface
return set_matrix_array(iface, device, constant, matrix, 1, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 4, 4); return set_matrix_array(iface, device, constant, matrix, 1, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 4, 4);
} }
static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixArray(struct ID3DXConstantTable *iface,
D3DXHANDLE constant, CONST D3DXMATRIX *matrix, UINT count) struct IDirect3DDevice9 *device, D3DXHANDLE constant, const D3DXMATRIX *matrix, UINT count)
{ {
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
@ -1479,8 +1481,8 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixArray(ID3DXConstantTable *
return set_matrix_array(iface, device, constant, matrix, count, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 4, 4); return set_matrix_array(iface, device, constant, matrix, count, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 4, 4);
} }
static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixPointerArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixPointerArray(struct ID3DXConstantTable *iface,
D3DXHANDLE constant, CONST D3DXMATRIX **matrix, UINT count) struct IDirect3DDevice9 *device, D3DXHANDLE constant, const D3DXMATRIX **matrix, UINT count)
{ {
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
@ -1489,8 +1491,8 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixPointerArray(ID3DXConstant
return set_matrix_pointer_array(iface, device, constant, matrix, count, D3DXPC_MATRIX_ROWS); return set_matrix_pointer_array(iface, device, constant, matrix, count, D3DXPC_MATRIX_ROWS);
} }
static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTranspose(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTranspose(struct ID3DXConstantTable *iface,
D3DXHANDLE constant, CONST D3DXMATRIX *matrix) struct IDirect3DDevice9 *device, D3DXHANDLE constant, const D3DXMATRIX *matrix)
{ {
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
@ -1499,8 +1501,8 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTranspose(ID3DXConstantTab
return set_matrix_array(iface, device, constant, matrix, 1, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 4, 4); return set_matrix_array(iface, device, constant, matrix, 1, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 4, 4);
} }
static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTransposeArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTransposeArray(struct ID3DXConstantTable *iface,
D3DXHANDLE constant, CONST D3DXMATRIX *matrix, UINT count) struct IDirect3DDevice9 *device, D3DXHANDLE constant, const D3DXMATRIX *matrix, UINT count)
{ {
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
@ -1509,8 +1511,8 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTransposeArray(ID3DXConsta
return set_matrix_array(iface, device, constant, matrix, count, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 4, 4); return set_matrix_array(iface, device, constant, matrix, count, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 4, 4);
} }
static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTransposePointerArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTransposePointerArray(struct ID3DXConstantTable *iface,
D3DXHANDLE constant, CONST D3DXMATRIX **matrix, UINT count) struct IDirect3DDevice9 *device, D3DXHANDLE constant, const D3DXMATRIX **matrix, UINT count)
{ {
struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);

4
dlls/d3dx9_36/sprite.c
View File

@ -119,7 +119,7 @@ static ULONG WINAPI ID3DXSpriteImpl_Release(ID3DXSprite *iface)
return ref; return ref;
} }
static HRESULT WINAPI ID3DXSpriteImpl_GetDevice(ID3DXSprite *iface, LPDIRECT3DDEVICE9 *device) static HRESULT WINAPI ID3DXSpriteImpl_GetDevice(struct ID3DXSprite *iface, struct IDirect3DDevice9 **device)
{ {
ID3DXSpriteImpl *This = impl_from_ID3DXSprite(iface); ID3DXSpriteImpl *This = impl_from_ID3DXSprite(iface);
@ -529,7 +529,7 @@ static const ID3DXSpriteVtbl D3DXSprite_Vtbl =
ID3DXSpriteImpl_OnResetDevice ID3DXSpriteImpl_OnResetDevice
}; };
HRESULT WINAPI D3DXCreateSprite(LPDIRECT3DDEVICE9 device, LPD3DXSPRITE *sprite) HRESULT WINAPI D3DXCreateSprite(struct IDirect3DDevice9 *device, struct ID3DXSprite **sprite)
{ {
ID3DXSpriteImpl *object; ID3DXSpriteImpl *object;
D3DCAPS9 caps; D3DCAPS9 caps;

2
dlls/d3dx9_36/tests/line.c
View File

@ -59,7 +59,7 @@ static void test_create_line(IDirect3DDevice9* device)
{ {
HRESULT hr; HRESULT hr;
LPD3DXLINE line = NULL; LPD3DXLINE line = NULL;
LPDIRECT3DDEVICE9 return_device; struct IDirect3DDevice9 *return_device;
D3DXMATRIX world, identity, result; D3DXMATRIX world, identity, result;
FLOAT r11, r12, r13, r14; FLOAT r11, r12, r13, r14;
ULONG ref; ULONG ref;

27
dlls/d3dx9_36/texture.c
View File

@ -184,13 +184,8 @@ HRESULT WINAPI D3DXFilterTexture(IDirect3DBaseTexture9 *texture,
} }
} }
HRESULT WINAPI D3DXCheckTextureRequirements(LPDIRECT3DDEVICE9 device, HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UINT *width, UINT *height,
UINT* width, UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool)
UINT* height,
UINT* miplevels,
DWORD usage,
D3DFORMAT* format,
D3DPOOL pool)
{ {
UINT w = (width && *width) ? *width : 1; UINT w = (width && *width) ? *width : 1;
UINT h = (height && *height) ? *height : 1; UINT h = (height && *height) ? *height : 1;
@ -389,12 +384,8 @@ cleanup:
return D3D_OK; return D3D_OK;
} }
HRESULT WINAPI D3DXCheckCubeTextureRequirements(LPDIRECT3DDEVICE9 device, HRESULT WINAPI D3DXCheckCubeTextureRequirements(struct IDirect3DDevice9 *device, UINT *size,
UINT *size, UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool)
UINT *miplevels,
DWORD usage,
D3DFORMAT *format,
D3DPOOL pool)
{ {
D3DCAPS9 caps; D3DCAPS9 caps;
UINT s = (size && *size) ? *size : 256; UINT s = (size && *size) ? *size : 256;
@ -429,14 +420,8 @@ HRESULT WINAPI D3DXCheckCubeTextureRequirements(LPDIRECT3DDEVICE9 device,
return hr; return hr;
} }
HRESULT WINAPI D3DXCheckVolumeTextureRequirements(LPDIRECT3DDEVICE9 device, HRESULT WINAPI D3DXCheckVolumeTextureRequirements(struct IDirect3DDevice9 *device, UINT *width, UINT *height,
UINT *width, UINT *depth, UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool)
UINT *height,
UINT *depth,
UINT *miplevels,
DWORD usage,
D3DFORMAT *format,
D3DPOOL pool)
{ {
D3DCAPS9 caps; D3DCAPS9 caps;
UINT w = width ? *width : D3DX_DEFAULT; UINT w = width ? *width : D3DX_DEFAULT;

13
include/d3dx9anim.h
View File

@ -367,10 +367,17 @@ DECLARE_INTERFACE_(ID3DXAnimationController, IUnknown)
extern "C" { extern "C" {
#endif #endif
HRESULT WINAPI D3DXLoadMeshHierarchyFromXA(LPCSTR, DWORD, LPDIRECT3DDEVICE9, LPD3DXALLOCATEHIERARCHY, LPD3DXLOADUSERDATA, LPD3DXFRAME*, LPD3DXANIMATIONCONTROLLER*); HRESULT WINAPI D3DXLoadMeshHierarchyFromXA(const char *filename, DWORD flags, struct IDirect3DDevice9 *device,
HRESULT WINAPI D3DXLoadMeshHierarchyFromXW(LPCWSTR, DWORD, LPDIRECT3DDEVICE9, LPD3DXALLOCATEHIERARCHY, LPD3DXLOADUSERDATA, LPD3DXFRAME*, LPD3DXANIMATIONCONTROLLER*); struct ID3DXAllocateHierarchy *alloc, struct ID3DXLoadUserData *user_data_loader,
D3DXFRAME **frame_hierarchy, struct ID3DXAnimationController **animation_controller);
HRESULT WINAPI D3DXLoadMeshHierarchyFromXW(const WCHAR *filename, DWORD flags, struct IDirect3DDevice9 *device,
struct ID3DXAllocateHierarchy *alloc, struct ID3DXLoadUserData *user_data_loader,
D3DXFRAME **frame_hierarchy, struct ID3DXAnimationController **animation_controller);
#define D3DXLoadMeshHierarchyFromX WINELIB_NAME_AW(D3DXLoadMeshHierarchyFromX) #define D3DXLoadMeshHierarchyFromX WINELIB_NAME_AW(D3DXLoadMeshHierarchyFromX)
HRESULT WINAPI D3DXLoadMeshHierarchyFromXInMemory(LPCVOID, DWORD, DWORD, LPDIRECT3DDEVICE9, LPD3DXALLOCATEHIERARCHY, LPD3DXLOADUSERDATA, LPD3DXFRAME*, LPD3DXANIMATIONCONTROLLER*); HRESULT WINAPI D3DXLoadMeshHierarchyFromXInMemory(const void *data, DWORD data_size, DWORD flags,
struct IDirect3DDevice9 *device, struct ID3DXAllocateHierarchy *alloc,
struct ID3DXLoadUserData *user_data_loader, D3DXFRAME **frame_hierarchy,
struct ID3DXAnimationController **animation_controller);
HRESULT WINAPI D3DXSaveMeshHierarchyToFileA(LPCSTR, DWORD, CONST D3DXFRAME*, LPD3DXANIMATIONCONTROLLER, LPD3DXSAVEUSERDATA); HRESULT WINAPI D3DXSaveMeshHierarchyToFileA(LPCSTR, DWORD, CONST D3DXFRAME*, LPD3DXANIMATIONCONTROLLER, LPD3DXSAVEUSERDATA);
HRESULT WINAPI D3DXSaveMeshHierarchyToFileW(LPCWSTR, DWORD, CONST D3DXFRAME*, LPD3DXANIMATIONCONTROLLER, LPD3DXSAVEUSERDATA); HRESULT WINAPI D3DXSaveMeshHierarchyToFileW(LPCWSTR, DWORD, CONST D3DXFRAME*, LPD3DXANIMATIONCONTROLLER, LPD3DXSAVEUSERDATA);
#define D3DXSaveMeshHierarchyToFile WINELIB_NAME_AW(D3DXSaveMeshHierarchyToFile) #define D3DXSaveMeshHierarchyToFile WINELIB_NAME_AW(D3DXSaveMeshHierarchyToFile)

46
include/d3dx9core.h
View File

@ -131,7 +131,7 @@ DECLARE_INTERFACE_(ID3DXFont, IUnknown)
STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXFont methods ***/ /*** ID3DXFont methods ***/
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9 *device) PURE; STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE;
STDMETHOD(GetDescA)(THIS_ D3DXFONT_DESCA *desc) PURE; STDMETHOD(GetDescA)(THIS_ D3DXFONT_DESCA *desc) PURE;
STDMETHOD(GetDescW)(THIS_ D3DXFONT_DESCW *desc) PURE; STDMETHOD(GetDescW)(THIS_ D3DXFONT_DESCW *desc) PURE;
STDMETHOD_(BOOL, GetTextMetricsA)(THIS_ TEXTMETRICA *metrics) PURE; STDMETHOD_(BOOL, GetTextMetricsA)(THIS_ TEXTMETRICA *metrics) PURE;
@ -212,7 +212,7 @@ DECLARE_INTERFACE_(ID3DXLine, IUnknown)
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXLine methods ***/ /*** ID3DXLine methods ***/
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9 *device) PURE; STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE;
STDMETHOD(Begin)(THIS) PURE; STDMETHOD(Begin)(THIS) PURE;
STDMETHOD(Draw)(THIS_ CONST D3DXVECTOR2 *vertexlist, DWORD vertexlistcount, D3DCOLOR color) PURE; STDMETHOD(Draw)(THIS_ CONST D3DXVECTOR2 *vertexlist, DWORD vertexlistcount, D3DCOLOR color) PURE;
@ -301,7 +301,7 @@ DECLARE_INTERFACE_(ID3DXRenderToEnvMap, IUnknown)
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXRenderToEnvMap methods ***/ /*** ID3DXRenderToEnvMap methods ***/
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9 *device) PURE; STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE;
STDMETHOD(GetDesc)(THIS_ D3DXRTE_DESC *desc) PURE; STDMETHOD(GetDesc)(THIS_ D3DXRTE_DESC *desc) PURE;
STDMETHOD(BeginCube)(THIS_ struct IDirect3DCubeTexture9 *cubetex) PURE; STDMETHOD(BeginCube)(THIS_ struct IDirect3DCubeTexture9 *cubetex) PURE;
@ -368,7 +368,7 @@ DECLARE_INTERFACE_(ID3DXRenderToSurface, IUnknown)
STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXRenderToSurface methods ***/ /*** ID3DXRenderToSurface methods ***/
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9 *device) PURE; STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE;
STDMETHOD(GetDesc)(THIS_ D3DXRTS_DESC *desc) PURE; STDMETHOD(GetDesc)(THIS_ D3DXRTS_DESC *desc) PURE;
STDMETHOD(BeginScene)(THIS_ struct IDirect3DSurface9 *surface, const D3DVIEWPORT9 *viewport) PURE; STDMETHOD(BeginScene)(THIS_ struct IDirect3DSurface9 *surface, const D3DVIEWPORT9 *viewport) PURE;
@ -413,7 +413,7 @@ DECLARE_INTERFACE_(ID3DXSprite, IUnknown)
STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXSprite methods ***/ /*** ID3DXSprite methods ***/
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9 *device) PURE; STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE;
STDMETHOD(GetTransform)(THIS_ D3DXMATRIX *transform) PURE; STDMETHOD(GetTransform)(THIS_ D3DXMATRIX *transform) PURE;
STDMETHOD(SetTransform)(THIS_ CONST D3DXMATRIX *transform) PURE; STDMETHOD(SetTransform)(THIS_ CONST D3DXMATRIX *transform) PURE;
@ -474,21 +474,27 @@ DECLARE_INTERFACE_(ID3DXSprite, IUnknown)
extern "C" { extern "C" {
#endif #endif
BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers); BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers);
HRESULT WINAPI D3DXCreateFontA(LPDIRECT3DDEVICE9 device, INT height, UINT width, UINT weight, UINT miplevels, BOOL italic, DWORD charset, HRESULT WINAPI D3DXCreateFontA(struct IDirect3DDevice9 *device, INT height, UINT width, UINT weight,
DWORD precision, DWORD quality, DWORD pitchandfamily, LPCSTR facename, LPD3DXFONT *font); UINT miplevels, BOOL italic, DWORD charset, DWORD precision, DWORD quality, DWORD pitchandfamily,
HRESULT WINAPI D3DXCreateFontW(LPDIRECT3DDEVICE9 device, INT height, UINT width, UINT weight, UINT miplevels, BOOL italic, DWORD charset, const char *facename, struct ID3DXFont **font);
DWORD precision, DWORD quality, DWORD pitchandfamily, LPCWSTR facename, LPD3DXFONT *font); HRESULT WINAPI D3DXCreateFontW(struct IDirect3DDevice9 *device, INT height, UINT width, UINT weight,
#define D3DXCreateFont WINELIB_NAME_AW(D3DXCreateFont) UINT miplevels, BOOL italic, DWORD charset, DWORD precision, DWORD quality, DWORD pitchandfamily,
HRESULT WINAPI D3DXCreateFontIndirectA(LPDIRECT3DDEVICE9 device, CONST D3DXFONT_DESCA *desc, LPD3DXFONT *font); const WCHAR *facename, struct ID3DXFont **font);
HRESULT WINAPI D3DXCreateFontIndirectW(LPDIRECT3DDEVICE9 device, CONST D3DXFONT_DESCW *desc, LPD3DXFONT *font); #define D3DXCreateFont WINELIB_NAME_AW(D3DXCreateFont)
#define D3DXCreateFontIndirect WINELIB_NAME_AW(D3DXCreateFontIndirect) HRESULT WINAPI D3DXCreateFontIndirectA(struct IDirect3DDevice9 *device,
HRESULT WINAPI D3DXCreateLine(LPDIRECT3DDEVICE9 device, LPD3DXLINE *line); const D3DXFONT_DESCA *desc, struct ID3DXFont **font);
HRESULT WINAPI D3DXCreateRenderToEnvMap(LPDIRECT3DDEVICE9 device, UINT size, UINT miplevels, D3DFORMAT format, BOOL stencil, D3DFORMAT stencil_format, LPD3DXRenderToEnvMap *rtem); HRESULT WINAPI D3DXCreateFontIndirectW(struct IDirect3DDevice9 *device,
HRESULT WINAPI D3DXCreateRenderToSurface(LPDIRECT3DDEVICE9 device, UINT width, UINT height, D3DFORMAT format, BOOL stencil, D3DFORMAT stencil_format, LPD3DXRENDERTOSURFACE *rts); const D3DXFONT_DESCW *desc, struct ID3DXFont **font);
HRESULT WINAPI D3DXCreateSprite(LPDIRECT3DDEVICE9 device, LPD3DXSPRITE *sprite); #define D3DXCreateFontIndirect WINELIB_NAME_AW(D3DXCreateFontIndirect)
BOOL WINAPI D3DXDebugMute(BOOL mute); HRESULT WINAPI D3DXCreateLine(struct IDirect3DDevice9 *device, struct ID3DXLine **line);
UINT WINAPI D3DXGetDriverLevel(LPDIRECT3DDEVICE9 device); HRESULT WINAPI D3DXCreateRenderToEnvMap(struct IDirect3DDevice9 *device, UINT size, UINT miplevels,
D3DFORMAT format, BOOL stencil, D3DFORMAT stencil_format, struct ID3DXRenderToEnvMap **rtem);
HRESULT WINAPI D3DXCreateRenderToSurface(struct IDirect3DDevice9 *device, UINT width, UINT height,
D3DFORMAT format, BOOL stencil, D3DFORMAT stencil_format, struct ID3DXRenderToSurface **rts);
HRESULT WINAPI D3DXCreateSprite(struct IDirect3DDevice9 *device, struct ID3DXSprite **sprite);
BOOL WINAPI D3DXDebugMute(BOOL mute);
UINT WINAPI D3DXGetDriverLevel(struct IDirect3DDevice9 *device);
#ifdef __cplusplus #ifdef __cplusplus
} }

131
include/d3dx9effect.h
View File

@ -269,7 +269,7 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect)
STDMETHOD(CommitChanges)(THIS) PURE; STDMETHOD(CommitChanges)(THIS) PURE;
STDMETHOD(EndPass)(THIS) PURE; STDMETHOD(EndPass)(THIS) PURE;
STDMETHOD(End)(THIS) PURE; STDMETHOD(End)(THIS) PURE;
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* device) PURE; STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE;
STDMETHOD(OnLostDevice)(THIS) PURE; STDMETHOD(OnLostDevice)(THIS) PURE;
STDMETHOD(OnResetDevice)(THIS) PURE; STDMETHOD(OnResetDevice)(THIS) PURE;
STDMETHOD(SetStateManager)(THIS_ LPD3DXEFFECTSTATEMANAGER manager) PURE; STDMETHOD(SetStateManager)(THIS_ LPD3DXEFFECTSTATEMANAGER manager) PURE;
@ -278,7 +278,7 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect)
STDMETHOD_(D3DXHANDLE, EndParameterBlock)(THIS) PURE; STDMETHOD_(D3DXHANDLE, EndParameterBlock)(THIS) PURE;
STDMETHOD(ApplyParameterBlock)(THIS_ D3DXHANDLE parameter_block) PURE; STDMETHOD(ApplyParameterBlock)(THIS_ D3DXHANDLE parameter_block) PURE;
STDMETHOD(DeleteParameterBlock)(THIS_ D3DXHANDLE parameter_block) PURE; STDMETHOD(DeleteParameterBlock)(THIS_ D3DXHANDLE parameter_block) PURE;
STDMETHOD(CloneEffect)(THIS_ LPDIRECT3DDEVICE9 device, LPD3DXEFFECT* effect) PURE; STDMETHOD(CloneEffect)(THIS_ struct IDirect3DDevice9 *device, struct ID3DXEffect **effect) PURE;
STDMETHOD(SetRawValue)(THIS_ D3DXHANDLE parameter, LPCVOID data, UINT byte_offset, UINT bytes) PURE; STDMETHOD(SetRawValue)(THIS_ D3DXHANDLE parameter, LPCVOID data, UINT byte_offset, UINT bytes) PURE;
}; };
#undef INTERFACE #undef INTERFACE
@ -364,28 +364,12 @@ extern "C" {
#endif #endif
HRESULT WINAPI D3DXCreateEffectPool(LPD3DXEFFECTPOOL* pool); HRESULT WINAPI D3DXCreateEffectPool(LPD3DXEFFECTPOOL* pool);
HRESULT WINAPI D3DXCreateEffect(struct IDirect3DDevice9 *device, const void *srcdata, UINT srcdatalen,
HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device, const D3DXMACRO *defines, struct ID3DXInclude *include, DWORD flags,
LPCVOID srcdata, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);
UINT srcdatalen, HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *srcdata, UINT srcdatalen,
CONST D3DXMACRO* defines, const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skip_constants, DWORD flags,
LPD3DXINCLUDE include, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);
DWORD flags,
LPD3DXEFFECTPOOL pool,
LPD3DXEFFECT* effect,
LPD3DXBUFFER* compilation_errors);
HRESULT WINAPI D3DXCreateEffectEx(LPDIRECT3DDEVICE9 device,
LPCVOID srcdata,
UINT srcdatalen,
CONST D3DXMACRO* defines,
LPD3DXINCLUDE include,
LPCSTR skip_constants,
DWORD flags,
LPD3DXEFFECTPOOL pool,
LPD3DXEFFECT* effect,
LPD3DXBUFFER* compilation_errors);
HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata, HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata,
UINT srcdatalen, UINT srcdatalen,
CONST D3DXMACRO* defines, CONST D3DXMACRO* defines,
@ -393,85 +377,38 @@ HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata,
DWORD flags, DWORD flags,
LPD3DXEFFECTCOMPILER* compiler, LPD3DXEFFECTCOMPILER* compiler,
LPD3DXBUFFER* parse_errors); LPD3DXBUFFER* parse_errors);
HRESULT WINAPI D3DXCreateEffectFromFileExA(struct IDirect3DDevice9 *device, const char *srcfile,
HRESULT WINAPI D3DXCreateEffectFromFileExA(LPDIRECT3DDEVICE9 device, const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skip_constants, DWORD flags,
LPCSTR srcfile, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);
const D3DXMACRO *defines, HRESULT WINAPI D3DXCreateEffectFromFileExW(struct IDirect3DDevice9 *device, const WCHAR *srcfile,
LPD3DXINCLUDE include, const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skip_constants, DWORD flags,
LPCSTR skipconstants, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);
DWORD flags,
LPD3DXEFFECTPOOL pool,
LPD3DXEFFECT *effect,
LPD3DXBUFFER *compilationerrors);
HRESULT WINAPI D3DXCreateEffectFromFileExW(LPDIRECT3DDEVICE9 device,
LPCWSTR srcfile,
const D3DXMACRO *defines,
LPD3DXINCLUDE include,
LPCSTR skipconstants,
DWORD flags,
LPD3DXEFFECTPOOL pool,
LPD3DXEFFECT *effect,
LPD3DXBUFFER *compilationerrors);
#define D3DXCreateEffectFromFileEx WINELIB_NAME_AW(D3DXCreateEffectFromFileEx) #define D3DXCreateEffectFromFileEx WINELIB_NAME_AW(D3DXCreateEffectFromFileEx)
HRESULT WINAPI D3DXCreateEffectFromFileA(LPDIRECT3DDEVICE9 device, HRESULT WINAPI D3DXCreateEffectFromFileA(struct IDirect3DDevice9 *device, const char *srcfile,
LPCSTR srcfile, const D3DXMACRO *defines, struct ID3DXInclude *include, DWORD flags,
const D3DXMACRO *defines, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);
LPD3DXINCLUDE include, HRESULT WINAPI D3DXCreateEffectFromFileW(struct IDirect3DDevice9 *device, const WCHAR *srcfile,
DWORD flags, const D3DXMACRO *defines, struct ID3DXInclude *include, DWORD flags,
LPD3DXEFFECTPOOL pool, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);
LPD3DXEFFECT *effect,
LPD3DXBUFFER *compilationerrors);
HRESULT WINAPI D3DXCreateEffectFromFileW(LPDIRECT3DDEVICE9 device,
LPCWSTR srcfile,
const D3DXMACRO *defines,
LPD3DXINCLUDE include,
DWORD flags,
LPD3DXEFFECTPOOL pool,
LPD3DXEFFECT *effect,
LPD3DXBUFFER *compilationerrors);
#define D3DXCreateEffectFromFile WINELIB_NAME_AW(D3DXCreateEffectFromFile) #define D3DXCreateEffectFromFile WINELIB_NAME_AW(D3DXCreateEffectFromFile)
HRESULT WINAPI D3DXCreateEffectFromResourceExA(LPDIRECT3DDEVICE9 device, HRESULT WINAPI D3DXCreateEffectFromResourceExA(struct IDirect3DDevice9 *device, HMODULE srcmodule,
HMODULE srcmodule, const char *srcresource, const D3DXMACRO *defines, struct ID3DXInclude *include,
LPCSTR srcresource, const char *skip_constants, DWORD flags, struct ID3DXEffectPool *pool,
const D3DXMACRO *defines, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);
LPD3DXINCLUDE include, HRESULT WINAPI D3DXCreateEffectFromResourceExW(struct IDirect3DDevice9 *device, HMODULE srcmodule,
LPCSTR skipconstants, const WCHAR *srcresource, const D3DXMACRO *defines, struct ID3DXInclude *include,
DWORD flags, const char *skip_constants, DWORD flags, struct ID3DXEffectPool *pool,
LPD3DXEFFECTPOOL pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);
LPD3DXEFFECT *effect,
LPD3DXBUFFER *compilationerrors);
HRESULT WINAPI D3DXCreateEffectFromResourceExW(LPDIRECT3DDEVICE9 device,
HMODULE srcmodule,
LPCWSTR srcresource,
const D3DXMACRO *defines,
LPD3DXINCLUDE include,
LPCSTR skipconstants,
DWORD flags,
LPD3DXEFFECTPOOL pool,
LPD3DXEFFECT *effect,
LPD3DXBUFFER *compilationerrors);
#define D3DXCreateEffectFromResourceEx WINELIB_NAME_AW(D3DXCreateEffectFromResourceEx) #define D3DXCreateEffectFromResourceEx WINELIB_NAME_AW(D3DXCreateEffectFromResourceEx)
HRESULT WINAPI D3DXCreateEffectFromResourceA(LPDIRECT3DDEVICE9 device, HRESULT WINAPI D3DXCreateEffectFromResourceA(struct IDirect3DDevice9 *device, HMODULE srcmodule,
HMODULE srcmodule, const char *srcresource, const D3DXMACRO *defines, struct ID3DXInclude *include, DWORD flags,
LPCSTR srcresource, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);
const D3DXMACRO *defines, HRESULT WINAPI D3DXCreateEffectFromResourceW(struct IDirect3DDevice9 *device, HMODULE srcmodule,
LPD3DXINCLUDE include, const WCHAR *srcresource, const D3DXMACRO *defines, struct ID3DXInclude *include, DWORD flags,
DWORD flags, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);
LPD3DXEFFECTPOOL pool,
LPD3DXEFFECT *effect,
LPD3DXBUFFER *compilationerrors);
HRESULT WINAPI D3DXCreateEffectFromResourceW(LPDIRECT3DDEVICE9 device,
HMODULE srcmodule,
LPCWSTR srcresource,
const D3DXMACRO *defines,
LPD3DXINCLUDE include,
DWORD flags,
LPD3DXEFFECTPOOL pool,
LPD3DXEFFECT *effect,
LPD3DXBUFFER *compilationerrors);
#define D3DXCreateEffectFromResource WINELIB_NAME_AW(D3DXCreateEffectFromResource) #define D3DXCreateEffectFromResource WINELIB_NAME_AW(D3DXCreateEffectFromResource)
HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(LPCSTR srcfile, HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(LPCSTR srcfile,

113
include/d3dx9mesh.h
View File

@ -318,10 +318,11 @@ DECLARE_INTERFACE_(ID3DXBaseMesh, IUnknown)
STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE; STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE;
STDMETHOD_(DWORD, GetNumBytesPerVertex)(THIS) PURE; STDMETHOD_(DWORD, GetNumBytesPerVertex)(THIS) PURE;
STDMETHOD_(DWORD, GetOptions)(THIS) PURE; STDMETHOD_(DWORD, GetOptions)(THIS) PURE;
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* device) PURE; STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE;
STDMETHOD(CloneMeshFVF)(THIS_ DWORD options, DWORD fvf, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE; STDMETHOD(CloneMeshFVF)(THIS_ DWORD options, DWORD fvf,
STDMETHOD(CloneMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device, struct IDirect3DDevice9 *device, struct ID3DXMesh **clone_mesh) PURE;
LPD3DXMESH* clone_mesh) PURE; STDMETHOD(CloneMesh)(THIS_ DWORD options, const D3DVERTEXELEMENT9 *declaration,
struct IDirect3DDevice9 *device, struct ID3DXMesh **clone_mesh) PURE;
STDMETHOD(GetVertexBuffer)(THIS_ struct IDirect3DVertexBuffer9 **vertex_buffer) PURE; STDMETHOD(GetVertexBuffer)(THIS_ struct IDirect3DVertexBuffer9 **vertex_buffer) PURE;
STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE; STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE;
STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE;
@ -351,10 +352,11 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh)
STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE; STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE;
STDMETHOD_(DWORD, GetNumBytesPerVertex)(THIS) PURE; STDMETHOD_(DWORD, GetNumBytesPerVertex)(THIS) PURE;
STDMETHOD_(DWORD, GetOptions)(THIS) PURE; STDMETHOD_(DWORD, GetOptions)(THIS) PURE;
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* device) PURE; STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE;
STDMETHOD(CloneMeshFVF)(THIS_ DWORD options, DWORD fvf, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE; STDMETHOD(CloneMeshFVF)(THIS_ DWORD options, DWORD fvf,
STDMETHOD(CloneMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device, struct IDirect3DDevice9 *device, struct ID3DXMesh **clone_mesh) PURE;
LPD3DXMESH* clone_mesh) PURE; STDMETHOD(CloneMesh)(THIS_ DWORD options, const D3DVERTEXELEMENT9 *declaration,
struct IDirect3DDevice9 *device, struct ID3DXMesh **clone_mesh) PURE;
STDMETHOD(GetVertexBuffer)(THIS_ struct IDirect3DVertexBuffer9 **vertex_buffer) PURE; STDMETHOD(GetVertexBuffer)(THIS_ struct IDirect3DVertexBuffer9 **vertex_buffer) PURE;
STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE; STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE;
STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE;
@ -392,10 +394,11 @@ DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh)
STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE; STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE;
STDMETHOD_(DWORD, GetNumBytesPerVertex)(THIS) PURE; STDMETHOD_(DWORD, GetNumBytesPerVertex)(THIS) PURE;
STDMETHOD_(DWORD, GetOptions)(THIS) PURE; STDMETHOD_(DWORD, GetOptions)(THIS) PURE;
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* device) PURE; STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE;
STDMETHOD(CloneMeshFVF)(THIS_ DWORD options, DWORD fvf, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE; STDMETHOD(CloneMeshFVF)(THIS_ DWORD options, DWORD fvf,
STDMETHOD(CloneMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device, struct IDirect3DDevice9 *device, struct ID3DXMesh **clone_mesh) PURE;
LPD3DXMESH* clone_mesh) PURE; STDMETHOD(CloneMesh)(THIS_ DWORD options, const D3DVERTEXELEMENT9 *declaration,
struct IDirect3DDevice9 *device, struct ID3DXMesh **clone_mesh) PURE;
STDMETHOD(GetVertexBuffer)(THIS_ struct IDirect3DVertexBuffer9 **vertex_buffer) PURE; STDMETHOD(GetVertexBuffer)(THIS_ struct IDirect3DVertexBuffer9 **vertex_buffer) PURE;
STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE; STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE;
STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE;
@ -408,9 +411,10 @@ DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh)
STDMETHOD(GenerateAdjacency)(THIS_ FLOAT epsilon, DWORD* adjacency) PURE; STDMETHOD(GenerateAdjacency)(THIS_ FLOAT epsilon, DWORD* adjacency) PURE;
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, DWORD fvf, LPDIRECT3DDEVICE9 device, LPD3DXPMESH* clone_mesh) PURE; STDMETHOD(ClonePMeshFVF)(THIS_ DWORD options, DWORD fvf,
STDMETHOD(ClonePMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device, struct IDirect3DDevice9 *device, struct ID3DXPMesh **clone_mesh) PURE;
LPD3DXPMESH* clone_mesh) PURE; STDMETHOD(ClonePMesh)(THIS_ DWORD options, const D3DVERTEXELEMENT9 *declaration,
struct IDirect3DDevice9 *device, struct ID3DXPMesh **clone_mesh) PURE;
STDMETHOD(SetNumFaces)(THIS_ DWORD faces) PURE; STDMETHOD(SetNumFaces)(THIS_ DWORD faces) PURE;
STDMETHOD(SetNumVertices)(THIS_ DWORD vertices) PURE; STDMETHOD(SetNumVertices)(THIS_ DWORD vertices) PURE;
STDMETHOD_(DWORD, GetMaxFaces)(THIS) PURE; STDMETHOD_(DWORD, GetMaxFaces)(THIS) PURE;
@ -441,15 +445,19 @@ DECLARE_INTERFACE_(ID3DXSPMesh, IUnknown)
STDMETHOD_(DWORD, GetNumFVF)(THIS) PURE; STDMETHOD_(DWORD, GetNumFVF)(THIS) PURE;
STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE; STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE;
STDMETHOD_(DWORD, GetOptions)(THIS) PURE; STDMETHOD_(DWORD, GetOptions)(THIS) PURE;
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* device) PURE; STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE;
STDMETHOD(CloneMeshFVF)(THIS_ DWORD options, DWORD fvf, LPDIRECT3DDEVICE9 device, DWORD* adjacency_out, STDMETHOD(CloneMeshFVF)(THIS_ DWORD options, DWORD fvf,
DWORD* vertex_remap_out, LPD3DXMESH* clone_mesh) PURE; struct IDirect3DDevice9 *device, DWORD *adjacency_out,
STDMETHOD(CloneMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device, DWORD *vertex_remap_out, struct ID3DXMesh **clone_mesh) PURE;
DWORD* adjacency_out, DWORD* vertex_remap_out, LPD3DXMESH* clone_mesh) PURE; STDMETHOD(CloneMesh)(THIS_ DWORD options, const D3DVERTEXELEMENT9 *declaration,
STDMETHOD(ClonePMeshFVF)(THIS_ DWORD options, DWORD fvf, LPDIRECT3DDEVICE9 device, DWORD* vertex_remap_out, struct IDirect3DDevice9 *device, DWORD *adjacency_out,
FLOAT* errors_by_face, LPD3DXPMESH* clone_mesh) PURE; DWORD *vertex_remap_out, struct ID3DXMesh **clone_mesh) PURE;
STDMETHOD(ClonePMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device, STDMETHOD(ClonePMeshFVF)(THIS_ DWORD options, DWORD fvf,
DWORD* vertex_remap_out, FLOAT* errors_by_face, LPD3DXPMESH* clone_mesh) PURE; struct IDirect3DDevice9 *device, DWORD *vertex_remap_out,
float *errors_by_face, struct ID3DXPMesh **clone_mesh) PURE;
STDMETHOD(ClonePMesh)(THIS_ DWORD options, const D3DVERTEXELEMENT9 *declaration,
struct IDirect3DDevice9 *device, DWORD *vertex_remap_out,
float *errors_by_face, struct ID3DXPMesh **clone_mesh) PURE;
STDMETHOD(ReduceFaces)(THIS_ DWORD faces) PURE; STDMETHOD(ReduceFaces)(THIS_ DWORD faces) PURE;
STDMETHOD(ReduceVertices)(THIS_ DWORD vertices) PURE; STDMETHOD(ReduceVertices)(THIS_ DWORD vertices) PURE;
STDMETHOD_(DWORD, GetMaxFaces)(THIS) PURE; STDMETHOD_(DWORD, GetMaxFaces)(THIS) PURE;
@ -472,7 +480,7 @@ DECLARE_INTERFACE_(ID3DXPatchMesh, IUnknown)
STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE; STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE;
STDMETHOD_(DWORD, GetControlVerticesPerPatch)(THIS) PURE; STDMETHOD_(DWORD, GetControlVerticesPerPatch)(THIS) PURE;
STDMETHOD_(DWORD, GetOptions)(THIS) PURE; STDMETHOD_(DWORD, GetOptions)(THIS) PURE;
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* device) PURE; STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE;
STDMETHOD(GetPatchInfo)(THIS_ LPD3DXPATCHINFO patch_info) PURE; STDMETHOD(GetPatchInfo)(THIS_ LPD3DXPATCHINFO patch_info) PURE;
STDMETHOD(GetVertexBuffer)(THIS_ struct IDirect3DVertexBuffer9 **vertex_buffer) PURE; STDMETHOD(GetVertexBuffer)(THIS_ struct IDirect3DVertexBuffer9 **vertex_buffer) PURE;
STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE; STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE;
@ -636,8 +644,8 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
STDMETHOD(SetPerTexelNormals)(THIS_ struct IDirect3DTexture9 *normal_texture) PURE; STDMETHOD(SetPerTexelNormals)(THIS_ struct IDirect3DTexture9 *normal_texture) PURE;
STDMETHOD(ExtractPerVertexAlbedo)(THIS_ LPD3DXMESH mesh, D3DDECLUSAGE usage, UINT num_channels) PURE; STDMETHOD(ExtractPerVertexAlbedo)(THIS_ LPD3DXMESH mesh, D3DDECLUSAGE usage, UINT num_channels) PURE;
STDMETHOD(ResampleBuffer)(THIS_ LPD3DXPRTBUFFER buffer_in, LPD3DXPRTBUFFER buffer_out) PURE; STDMETHOD(ResampleBuffer)(THIS_ LPD3DXPRTBUFFER buffer_in, LPD3DXPRTBUFFER buffer_out) PURE;
STDMETHOD(GetAdaptedMesh)(THIS_ LPDIRECT3DDEVICE9 device, UINT *face_remap, STDMETHOD(GetAdaptedMesh)(THIS_ struct IDirect3DDevice9 *device, UINT *face_remap,
UINT *vert_remap, FLOAT *vert_weights, LPD3DXMESH *mesh) PURE; UINT *vert_remap, float *vert_weights, struct ID3DXMesh **mesh) PURE;
STDMETHOD_(UINT, GetNumVerts)(THIS) PURE; STDMETHOD_(UINT, GetNumVerts)(THIS) PURE;
STDMETHOD_(UINT, GetNumFaces)(THIS) PURE; STDMETHOD_(UINT, GetNumFaces)(THIS) PURE;
STDMETHOD(SetMinMaxIntersection)(THIS_ FLOAT min, FLOAT max) PURE; STDMETHOD(SetMinMaxIntersection)(THIS_ FLOAT min, FLOAT max) PURE;
@ -647,8 +655,8 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
STDMETHOD(ComputeDirectLightingSH)(THIS_ UINT sh_order, LPD3DXPRTBUFFER data_out) PURE; STDMETHOD(ComputeDirectLightingSH)(THIS_ UINT sh_order, LPD3DXPRTBUFFER data_out) PURE;
STDMETHOD(ComputeDirectLightingSHAdaptive)(THIS_ UINT sh_order, FLOAT adaptive_thresh, STDMETHOD(ComputeDirectLightingSHAdaptive)(THIS_ UINT sh_order, FLOAT adaptive_thresh,
FLOAT min_edge_length, UINT max_subdiv, LPD3DXPRTBUFFER data_out) PURE; FLOAT min_edge_length, UINT max_subdiv, LPD3DXPRTBUFFER data_out) PURE;
STDMETHOD(ComputeDirectLightingSHGPU)(THIS_ LPDIRECT3DDEVICE9 device, UINT flags, STDMETHOD(ComputeDirectLightingSHGPU)(THIS_ struct IDirect3DDevice9 *device, UINT flags,
UINT sh_order, FLOAT zbias, FLOAT zangle_bias, LPD3DXPRTBUFFER data_out) PURE; UINT sh_order, float zbias, float zangle_bias, struct ID3DXPRTBuffer *data_out) PURE;
STDMETHOD(ComputeSS)(THIS_ LPD3DXPRTBUFFER data_in, LPD3DXPRTBUFFER data_out, STDMETHOD(ComputeSS)(THIS_ LPD3DXPRTBUFFER data_in, LPD3DXPRTBUFFER data_out,
LPD3DXPRTBUFFER data_total) PURE; LPD3DXPRTBUFFER data_total) PURE;
STDMETHOD(ComputeSSAdaptive)(THIS_ LPD3DXPRTBUFFER data_in, FLOAT adaptive_thres, STDMETHOD(ComputeSSAdaptive)(THIS_ LPD3DXPRTBUFFER data_in, FLOAT adaptive_thres,
@ -683,28 +691,49 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
extern "C" { extern "C" {
#endif #endif
HRESULT WINAPI D3DXCreateMesh(DWORD, DWORD, DWORD, CONST D3DVERTEXELEMENT9 *, LPDIRECT3DDEVICE9, LPD3DXMESH *); HRESULT WINAPI D3DXCreateMesh(DWORD face_count, DWORD vertex_count, DWORD flags,
HRESULT WINAPI D3DXCreateMeshFVF(DWORD, DWORD, DWORD, DWORD, LPDIRECT3DDEVICE9, LPD3DXMESH *); const D3DVERTEXELEMENT9 *declaration, struct IDirect3DDevice9 *device, struct ID3DXMesh **mesh);
HRESULT WINAPI D3DXCreateMeshFVF(DWORD face_count, DWORD vertex_count, DWORD flags,
DWORD fvf, struct IDirect3DDevice9 *device, struct ID3DXMesh **mesh);
HRESULT WINAPI D3DXCreateBuffer(DWORD, LPD3DXBUFFER*); HRESULT WINAPI D3DXCreateBuffer(DWORD, LPD3DXBUFFER*);
HRESULT WINAPI D3DXCreateSPMesh(LPD3DXMESH, CONST DWORD *, CONST D3DXATTRIBUTEWEIGHTS, CONST FLOAT *, LPD3DXSPMESH *); HRESULT WINAPI D3DXCreateSPMesh(LPD3DXMESH, CONST DWORD *, CONST D3DXATTRIBUTEWEIGHTS, CONST FLOAT *, LPD3DXSPMESH *);
HRESULT WINAPI D3DXCreatePMeshFromStream(IStream *, DWORD, LPDIRECT3DDEVICE9, LPD3DXBUFFER *, LPD3DXBUFFER *, DWORD *, LPD3DXPMESH *); HRESULT WINAPI D3DXCreatePMeshFromStream(struct IStream *stream, DWORD flags, struct IDirect3DDevice9 *device,
struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances,
DWORD *material_count, struct ID3DXPMesh **mesh);
HRESULT WINAPI D3DXCreateSkinInfo(DWORD, CONST D3DVERTEXELEMENT9 *, DWORD, LPD3DXSKININFO *); HRESULT WINAPI D3DXCreateSkinInfo(DWORD, CONST D3DVERTEXELEMENT9 *, DWORD, LPD3DXSKININFO *);
HRESULT WINAPI D3DXCreateSkinInfoFVF(DWORD, DWORD, DWORD, LPD3DXSKININFO *); HRESULT WINAPI D3DXCreateSkinInfoFVF(DWORD, DWORD, DWORD, LPD3DXSKININFO *);
HRESULT WINAPI D3DXCreateSkinInfoFromBlendedMesh(LPD3DXBASEMESH, DWORD, CONST D3DXBONECOMBINATION *, LPD3DXSKININFO *); HRESULT WINAPI D3DXCreateSkinInfoFromBlendedMesh(LPD3DXBASEMESH, DWORD, CONST D3DXBONECOMBINATION *, LPD3DXSKININFO *);
HRESULT WINAPI D3DXCreatePatchMesh(CONST D3DXPATCHINFO *, DWORD, DWORD, DWORD, CONST D3DVERTEXELEMENT9 *, LPDIRECT3DDEVICE9, LPD3DXPATCHMESH *); HRESULT WINAPI D3DXCreatePatchMesh(const D3DXPATCHINFO *patch_info, DWORD patch_count,
DWORD vertex_count, DWORD flags, const D3DVERTEXELEMENT9 *declaration,
struct IDirect3DDevice9 *device, struct ID3DXPatchMesh **mesh);
HRESULT WINAPI D3DXCreatePRTBuffer(UINT, UINT, UINT, LPD3DXPRTBUFFER *); HRESULT WINAPI D3DXCreatePRTBuffer(UINT, UINT, UINT, LPD3DXPRTBUFFER *);
HRESULT WINAPI D3DXCreatePRTBufferTex(UINT, UINT, UINT, UINT, LPD3DXPRTBUFFER *); HRESULT WINAPI D3DXCreatePRTBufferTex(UINT, UINT, UINT, UINT, LPD3DXPRTBUFFER *);
HRESULT WINAPI D3DXCreatePRTCompBuffer(D3DXSHCOMPRESSQUALITYTYPE, UINT, UINT, LPD3DXSHPRTSIMCB, LPVOID, LPD3DXPRTBUFFER, LPD3DXPRTCOMPBUFFER *); HRESULT WINAPI D3DXCreatePRTCompBuffer(D3DXSHCOMPRESSQUALITYTYPE, UINT, UINT, LPD3DXSHPRTSIMCB, LPVOID, LPD3DXPRTBUFFER, LPD3DXPRTCOMPBUFFER *);
HRESULT WINAPI D3DXCreateTextureGutterHelper(UINT, UINT, LPD3DXMESH, FLOAT, LPD3DXTEXTUREGUTTERHELPER *); HRESULT WINAPI D3DXCreateTextureGutterHelper(UINT, UINT, LPD3DXMESH, FLOAT, LPD3DXTEXTUREGUTTERHELPER *);
HRESULT WINAPI D3DXCreatePRTEngine(LPD3DXMESH, DWORD *, BOOL, LPD3DXMESH, LPD3DXPRTENGINE *); HRESULT WINAPI D3DXCreatePRTEngine(LPD3DXMESH, DWORD *, BOOL, LPD3DXMESH, LPD3DXPRTENGINE *);
HRESULT WINAPI D3DXLoadMeshFromXA(LPCSTR, DWORD, LPDIRECT3DDEVICE9, LPD3DXBUFFER *, LPD3DXBUFFER *, LPD3DXBUFFER *, DWORD *, LPD3DXMESH *); HRESULT WINAPI D3DXLoadMeshFromXA(const char *filename, DWORD flags, struct IDirect3DDevice9 *device,
HRESULT WINAPI D3DXLoadMeshFromXW(LPCWSTR, DWORD, LPDIRECT3DDEVICE9, LPD3DXBUFFER *, LPD3DXBUFFER *, LPD3DXBUFFER *, DWORD *, LPD3DXMESH *); struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances,
DWORD *material_count, struct ID3DXMesh **mesh);
HRESULT WINAPI D3DXLoadMeshFromXW(const WCHAR *filename, DWORD flags, struct IDirect3DDevice9 *device,
struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances,
DWORD *material_count, struct ID3DXMesh **mesh);
#define D3DXLoadMeshFromX WINELIB_NAME_AW(D3DXLoadMeshFromX) #define D3DXLoadMeshFromX WINELIB_NAME_AW(D3DXLoadMeshFromX)
HRESULT WINAPI D3DXLoadMeshFromXInMemory(LPCVOID, DWORD, DWORD, LPDIRECT3DDEVICE9, LPD3DXBUFFER *, LPD3DXBUFFER *, LPD3DXBUFFER *, DWORD *, LPD3DXMESH *); HRESULT WINAPI D3DXLoadMeshFromXInMemory(const void *data, DWORD data_size, DWORD flags,
HRESULT WINAPI D3DXLoadMeshFromXResource(HMODULE, LPCSTR, LPCSTR, DWORD, LPDIRECT3DDEVICE9, LPD3DXBUFFER *, LPD3DXBUFFER *, LPD3DXBUFFER *, DWORD *, LPD3DXMESH *); struct IDirect3DDevice9 *device, struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials,
HRESULT WINAPI D3DXLoadMeshFromXof(LPD3DXFILEDATA, DWORD, LPDIRECT3DDEVICE9, LPD3DXBUFFER *, LPD3DXBUFFER *, LPD3DXBUFFER *, DWORD *, LPD3DXMESH *); struct ID3DXBuffer **effect_instances, DWORD *material_count, struct ID3DXMesh **mesh);
HRESULT WINAPI D3DXLoadPatchMeshFromXof(LPD3DXFILEDATA, DWORD, LPDIRECT3DDEVICE9, LPD3DXBUFFER *, LPD3DXBUFFER *, LPD3DXBUFFER *, DWORD *, LPD3DXPATCHMESH *); HRESULT WINAPI D3DXLoadMeshFromXResource(HMODULE module, const char *resource, const char *resource_type,
HRESULT WINAPI D3DXLoadSkinMeshFromXof(LPD3DXFILEDATA, DWORD, LPDIRECT3DDEVICE9, LPD3DXBUFFER *, LPD3DXBUFFER *, LPD3DXBUFFER *, DWORD *, LPD3DXSKININFO *, LPD3DXMESH *); DWORD flags, struct IDirect3DDevice9 *device, struct ID3DXBuffer **adjacency,
struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances,
DWORD *material_count, struct ID3DXMesh **mesh);
HRESULT WINAPI D3DXLoadMeshFromXof(struct ID3DXFileData *file_data, DWORD flags, struct IDirect3DDevice9 *device,
struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances,
DWORD *material_count, struct ID3DXMesh **mesh);
HRESULT WINAPI D3DXLoadPatchMeshFromXof(struct ID3DXFileData *file_data, DWORD flags, struct IDirect3DDevice9 *device,
struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances,
DWORD *material_count, struct ID3DXPatchMesh **mesh);
HRESULT WINAPI D3DXLoadSkinMeshFromXof(struct ID3DXFileData *file_data, DWORD flags, struct IDirect3DDevice9 *device,
struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances,
DWORD *material_count, struct ID3DXSkinInfo **skin_info, struct ID3DXMesh **mesh);
HRESULT WINAPI D3DXLoadPRTBufferFromFileA(LPCSTR, LPD3DXPRTBUFFER *); HRESULT WINAPI D3DXLoadPRTBufferFromFileA(LPCSTR, LPD3DXPRTBUFFER *);
HRESULT WINAPI D3DXLoadPRTBufferFromFileW(LPCWSTR, LPD3DXPRTBUFFER *); HRESULT WINAPI D3DXLoadPRTBufferFromFileW(LPCWSTR, LPD3DXPRTBUFFER *);
#define D3DXLoadPRTBufferFromFile WINELIB_NAME_AW(D3DXLoadPRTBufferFromFile) #define D3DXLoadPRTBufferFromFile WINELIB_NAME_AW(D3DXLoadPRTBufferFromFile)
@ -726,7 +755,9 @@ UINT WINAPI D3DXGetFVFVertexSize(DWORD);
BOOL WINAPI D3DXBoxBoundProbe(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *); BOOL WINAPI D3DXBoxBoundProbe(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *);
BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *,FLOAT,CONST D3DXVECTOR3 *,CONST D3DXVECTOR3 *); BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *,FLOAT,CONST D3DXVECTOR3 *,CONST D3DXVECTOR3 *);
HRESULT WINAPI D3DXCleanMesh(D3DXCLEANTYPE, LPD3DXMESH, CONST DWORD *, LPD3DXMESH *, DWORD *, LPD3DXBUFFER *); HRESULT WINAPI D3DXCleanMesh(D3DXCLEANTYPE, LPD3DXMESH, CONST DWORD *, LPD3DXMESH *, DWORD *, LPD3DXBUFFER *);
HRESULT WINAPI D3DXConcatenateMeshes(LPD3DXMESH *, UINT, DWORD, CONST D3DXMATRIX *, CONST D3DXMATRIX *, CONST D3DVERTEXELEMENT9 *, LPDIRECT3DDEVICE9, LPD3DXMESH *); HRESULT WINAPI D3DXConcatenateMeshes(struct ID3DXMesh **meshes, UINT mesh_count, DWORD flags,
const D3DXMATRIX *geometry_matrices, const D3DXMATRIX *texture_matrices,
const D3DVERTEXELEMENT9 *declaration, struct IDirect3DDevice9 *device, struct ID3DXMesh **mesh);
HRESULT WINAPI D3DXComputeBoundingBox(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, D3DXVECTOR3 *); HRESULT WINAPI D3DXComputeBoundingBox(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, D3DXVECTOR3 *);
HRESULT WINAPI D3DXComputeBoundingSphere(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, FLOAT *); HRESULT WINAPI D3DXComputeBoundingSphere(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, FLOAT *);
HRESULT WINAPI D3DXComputeIMTFromPerTexelSignal(LPD3DXMESH, DWORD, FLOAT *, UINT, UINT, UINT, UINT, DWORD, LPD3DXUVATLASCB, LPVOID, LPD3DXBUFFER *); HRESULT WINAPI D3DXComputeIMTFromPerTexelSignal(LPD3DXMESH, DWORD, FLOAT *, UINT, UINT, UINT, UINT, DWORD, LPD3DXUVATLASCB, LPVOID, LPD3DXBUFFER *);

46
include/d3dx9shader.h
View File

@ -133,22 +133,32 @@ DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer)
STDMETHOD_(D3DXHANDLE, GetConstant)(THIS_ D3DXHANDLE hConstant, UINT Index) PURE; STDMETHOD_(D3DXHANDLE, GetConstant)(THIS_ D3DXHANDLE hConstant, UINT Index) PURE;
STDMETHOD_(D3DXHANDLE, GetConstantByName)(THIS_ D3DXHANDLE hConstant, LPCSTR pName) PURE; STDMETHOD_(D3DXHANDLE, GetConstantByName)(THIS_ D3DXHANDLE hConstant, LPCSTR pName) PURE;
STDMETHOD_(D3DXHANDLE, GetConstantElement)(THIS_ D3DXHANDLE hConstant, UINT Index) PURE; STDMETHOD_(D3DXHANDLE, GetConstantElement)(THIS_ D3DXHANDLE hConstant, UINT Index) PURE;
STDMETHOD(SetDefaults)(THIS_ LPDIRECT3DDEVICE9 pDevice) PURE; STDMETHOD(SetDefaults)(THIS_ struct IDirect3DDevice9 *device) PURE;
STDMETHOD(SetValue)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, LPCVOID pData, UINT Bytes) PURE; STDMETHOD(SetValue)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant,
STDMETHOD(SetBool)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, BOOL b) PURE; const void *data, UINT data_size) PURE;
STDMETHOD(SetBoolArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST BOOL* pb, UINT Count) PURE; STDMETHOD(SetBool)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant, BOOL value) PURE;
STDMETHOD(SetInt)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, INT n) PURE; STDMETHOD(SetBoolArray)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant,
STDMETHOD(SetIntArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST INT* pn, UINT Count) PURE; const BOOL *values, UINT value_count) PURE;
STDMETHOD(SetFloat)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, FLOAT f) PURE; STDMETHOD(SetInt)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant, INT value) PURE;
STDMETHOD(SetFloatArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST FLOAT* pf, UINT Count) PURE; STDMETHOD(SetIntArray)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant,
STDMETHOD(SetVector)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXVECTOR4* pVector) PURE; const INT *values, UINT value_count) PURE;
STDMETHOD(SetVectorArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXVECTOR4* pVector, UINT Count) PURE; STDMETHOD(SetFloat)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant, float value) PURE;
STDMETHOD(SetMatrix)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX* pMatrix) PURE; STDMETHOD(SetFloatArray)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant,
STDMETHOD(SetMatrixArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX* pMatrix, UINT Count) PURE; const float *values, UINT value_count) PURE;
STDMETHOD(SetMatrixPointerArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX** ppMatrix, UINT Count) PURE; STDMETHOD(SetVector)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant, const D3DXVECTOR4 *value) PURE;
STDMETHOD(SetMatrixTranspose)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX* pMatrix) PURE; STDMETHOD(SetVectorArray)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant,
STDMETHOD(SetMatrixTransposeArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX* pMatrix, UINT Count) PURE; const D3DXVECTOR4 *values, UINT value_count) PURE;
STDMETHOD(SetMatrixTransposePointerArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX** ppMatrix, UINT Count) PURE; STDMETHOD(SetMatrix)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant, const D3DXMATRIX *value) PURE;
STDMETHOD(SetMatrixArray)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant,
const D3DXMATRIX *values, UINT value_count) PURE;
STDMETHOD(SetMatrixPointerArray)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant,
const D3DXMATRIX **values, UINT value_count) PURE;
STDMETHOD(SetMatrixTranspose)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant,
const D3DXMATRIX *value) PURE;
STDMETHOD(SetMatrixTransposeArray)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant,
const D3DXMATRIX *values, UINT value_count) PURE;
STDMETHOD(SetMatrixTransposePointerArray)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant,
const D3DXMATRIX **values, UINT value_count) PURE;
}; };
#undef INTERFACE #undef INTERFACE
@ -253,10 +263,10 @@ typedef struct ID3DXInclude *LPD3DXINCLUDE;
extern "C" { extern "C" {
#endif #endif
LPCSTR WINAPI D3DXGetPixelShaderProfile(LPDIRECT3DDEVICE9 device); const char * WINAPI D3DXGetPixelShaderProfile(struct IDirect3DDevice9 *device);
UINT WINAPI D3DXGetShaderSize(const DWORD *byte_code); UINT WINAPI D3DXGetShaderSize(const DWORD *byte_code);
DWORD WINAPI D3DXGetShaderVersion(const DWORD *byte_code); DWORD WINAPI D3DXGetShaderVersion(const DWORD *byte_code);
LPCSTR WINAPI D3DXGetVertexShaderProfile(LPDIRECT3DDEVICE9 device); const char * WINAPI D3DXGetVertexShaderProfile(struct IDirect3DDevice9 *device);
HRESULT WINAPI D3DXFindShaderComment(CONST DWORD* byte_code, DWORD fourcc, LPCVOID* data, UINT* size); HRESULT WINAPI D3DXFindShaderComment(CONST DWORD* byte_code, DWORD fourcc, LPCVOID* data, UINT* size);
HRESULT WINAPI D3DXGetShaderSamplers(CONST DWORD *byte_code, LPCSTR *samplers, UINT *count); HRESULT WINAPI D3DXGetShaderSamplers(CONST DWORD *byte_code, LPCSTR *samplers, UINT *count);

56
include/d3dx9shape.h
View File

@ -25,50 +25,18 @@
extern "C" { extern "C" {
#endif #endif
HRESULT WINAPI D3DXCreateBox(LPDIRECT3DDEVICE9 device, HRESULT WINAPI D3DXCreateBox(struct IDirect3DDevice9 *device, float width, float height,
FLOAT width, float depth, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency);
FLOAT height, HRESULT WINAPI D3DXCreateCylinder(struct IDirect3DDevice9 *device, float radius1, float radius2,
FLOAT depth, float length, UINT slices, UINT stacks, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency);
LPD3DXMESH* mesh, HRESULT WINAPI D3DXCreateSphere(struct IDirect3DDevice9 *device, float radius, UINT slices,
LPD3DXBUFFER* adjacency); UINT stacks, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency);
HRESULT WINAPI D3DXCreateTeapot(struct IDirect3DDevice9 *device,
HRESULT WINAPI D3DXCreateSphere(LPDIRECT3DDEVICE9 device, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency);
FLOAT radius, HRESULT WINAPI D3DXCreateTextA(struct IDirect3DDevice9 *device, HDC hdc, const char *text, float deviation,
UINT slices, float extrusion, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency, GLYPHMETRICSFLOAT *glyphmetrics);
UINT stacks, HRESULT WINAPI D3DXCreateTextW(struct IDirect3DDevice9 *device, HDC hdc, const WCHAR *text, float deviation,
LPD3DXMESH* mesh, FLOAT extrusion, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency, GLYPHMETRICSFLOAT *glyphmetrics);
LPD3DXBUFFER* adjacency);
HRESULT WINAPI D3DXCreateCylinder(LPDIRECT3DDEVICE9 device,
FLOAT radius1,
FLOAT radius2,
FLOAT length,
UINT slices,
UINT stacks,
LPD3DXMESH *mesh,
LPD3DXBUFFER *adjacency);
HRESULT WINAPI D3DXCreateTeapot(LPDIRECT3DDEVICE9 device,
LPD3DXMESH *mesh,
LPD3DXBUFFER *adjacency);
HRESULT WINAPI D3DXCreateTextA(LPDIRECT3DDEVICE9 device,
HDC hdc,
LPCSTR text,
FLOAT deviation,
FLOAT extrusion,
LPD3DXMESH *mesh,
LPD3DXBUFFER *adjacency,
LPGLYPHMETRICSFLOAT glyphmetrics);
HRESULT WINAPI D3DXCreateTextW(LPDIRECT3DDEVICE9 device,
HDC hdc,
LPCWSTR text,
FLOAT deviation,
FLOAT extrusion,
LPD3DXMESH *mesh,
LPD3DXBUFFER *adjacency,
LPGLYPHMETRICSFLOAT glyphmetrics);
#define D3DXCreateText WINELIB_NAME_AW(D3DXCreateText) #define D3DXCreateText WINELIB_NAME_AW(D3DXCreateText)
#ifdef __cplusplus #ifdef __cplusplus

28
include/d3dx9tex.h
View File

@ -182,28 +182,12 @@ HRESULT WINAPI D3DXSaveVolumeToFileW(const WCHAR *destfile, D3DXIMAGE_FILEFORMAT
/* Texture, cube texture and volume texture creation */ /* Texture, cube texture and volume texture creation */
HRESULT WINAPI D3DXCheckTextureRequirements( LPDIRECT3DDEVICE9 device, HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UINT *width, UINT *height,
UINT *width, UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool);
UINT *height, HRESULT WINAPI D3DXCheckCubeTextureRequirements(struct IDirect3DDevice9 *device, UINT *size,
UINT *miplevels, UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool);
DWORD usage, HRESULT WINAPI D3DXCheckVolumeTextureRequirements(struct IDirect3DDevice9 *device, UINT *width, UINT *height,
D3DFORMAT *format, UINT *depth, UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool);
D3DPOOL pool);
HRESULT WINAPI D3DXCheckCubeTextureRequirements( LPDIRECT3DDEVICE9 device,
UINT *size,
UINT *miplevels,
DWORD usage,
D3DFORMAT *format,
D3DPOOL pool);
HRESULT WINAPI D3DXCheckVolumeTextureRequirements(LPDIRECT3DDEVICE9 device,
UINT *width,
UINT *height,
UINT *depth,
UINT *miplevels,
DWORD usage,
D3DFORMAT *format,
D3DPOOL pool);
HRESULT WINAPI D3DXCreateTexture(struct IDirect3DDevice9 *device, UINT width, UINT height, HRESULT WINAPI D3DXCreateTexture(struct IDirect3DDevice9 *device, UINT width, UINT height,
UINT miplevels, DWORD usage, D3DFORMAT format, D3DPOOL pool, struct IDirect3DTexture9 **texture); UINT miplevels, DWORD usage, D3DFORMAT format, D3DPOOL pool, struct IDirect3DTexture9 **texture);