Skip to content

W
wine-winehq
Commit 4ba69743 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

d3dx9: Avoid LPDIRECT3DDEVICE9.

parent 6c26a0fa
Expand all Show whitespace changes
Inline Side-by-side
Showing with 166 additions and 215 deletions
dlls/d3dx9_36/d3dx9_36_main.c
View file @ 4ba69743
......@@ -76,7 +76,7 @@ BOOL WINAPI D3DXDebugMute(BOOL mute)
* D3DXGetDriverLevel.
* Returns always 900 (DX 9) for us
*/
UINT WINAPI D3DXGetDriverLevel(LPDIRECT3DDEVICE9 device)
UINT WINAPI D3DXGetDriverLevel(struct IDirect3DDevice9 *device)
{
return 900;
}
dlls/d3dx9_36/font.c
View file @ 4ba69743
......@@ -228,8 +228,9 @@ static const ID3DXFontVtbl D3DXFont_Vtbl =
ID3DXFontImpl_OnResetDevice
};
HRESULT WINAPI D3DXCreateFontA(LPDIRECT3DDEVICE9 device, INT height, UINT width, UINT weight, UINT miplevels, BOOL italic, DWORD charset,
DWORD precision, DWORD quality, DWORD pitchandfamily, LPCSTR facename, LPD3DXFONT *font)
HRESULT WINAPI D3DXCreateFontA(struct IDirect3DDevice9 *device, INT height, UINT width,
UINT weight, UINT miplevels, BOOL italic, DWORD charset, DWORD precision, DWORD quality,
DWORD pitchandfamily, const char *facename, struct ID3DXFont **font)
{
D3DXFONT_DESCA desc;
......
dlls/d3dx9_36/line.c
View file @ 4ba69743
......@@ -81,7 +81,7 @@ static ULONG WINAPI ID3DXLineImpl_Release(ID3DXLine* iface)
}
/*** 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);
......@@ -328,7 +328,7 @@ static const struct ID3DXLineVtbl ID3DXLine_Vtbl =
ID3DXLineImpl_OnResetDevice
};
HRESULT WINAPI D3DXCreateLine(LPDIRECT3DDEVICE9 device, LPD3DXLINE* line)
HRESULT WINAPI D3DXCreateLine(struct IDirect3DDevice9 *device, struct ID3DXLine **line)
{
ID3DXLineImpl* object;
......
dlls/d3dx9_36/sprite.c
View file @ 4ba69743
......@@ -119,7 +119,7 @@ static ULONG WINAPI ID3DXSpriteImpl_Release(ID3DXSprite *iface)
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);
......@@ -529,7 +529,7 @@ static const ID3DXSpriteVtbl D3DXSprite_Vtbl =
ID3DXSpriteImpl_OnResetDevice
};
HRESULT WINAPI D3DXCreateSprite(LPDIRECT3DDEVICE9 device, LPD3DXSPRITE *sprite)
HRESULT WINAPI D3DXCreateSprite(struct IDirect3DDevice9 *device, struct ID3DXSprite **sprite)
{
ID3DXSpriteImpl *object;
D3DCAPS9 caps;
......
dlls/d3dx9_36/tests/line.c
View file @ 4ba69743
......@@ -59,7 +59,7 @@ static void test_create_line(IDirect3DDevice9* device)
{
HRESULT hr;
LPD3DXLINE line = NULL;
LPDIRECT3DDEVICE9 return_device;
struct IDirect3DDevice9 *return_device;
D3DXMATRIX world, identity, result;
FLOAT r11, r12, r13, r14;
ULONG ref;
......
dlls/d3dx9_36/texture.c
View file @ 4ba69743
......@@ -184,13 +184,8 @@ HRESULT WINAPI D3DXFilterTexture(IDirect3DBaseTexture9 *texture,
}
}
HRESULT WINAPI D3DXCheckTextureRequirements(LPDIRECT3DDEVICE9 device,
UINT* width,
UINT* height,
UINT* miplevels,
DWORD usage,
D3DFORMAT* format,
D3DPOOL pool)
HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UINT *width, UINT *height,
UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool)
{
UINT w = (width && *width) ? *width : 1;
UINT h = (height && *height) ? *height : 1;
......@@ -389,12 +384,8 @@ cleanup:
return D3D_OK;
}
HRESULT WINAPI D3DXCheckCubeTextureRequirements(LPDIRECT3DDEVICE9 device,
UINT *size,
UINT *miplevels,
DWORD usage,
D3DFORMAT *format,
D3DPOOL pool)
HRESULT WINAPI D3DXCheckCubeTextureRequirements(struct IDirect3DDevice9 *device, UINT *size,
UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool)
{
D3DCAPS9 caps;
UINT s = (size && *size) ? *size : 256;
......@@ -429,14 +420,8 @@ HRESULT WINAPI D3DXCheckCubeTextureRequirements(LPDIRECT3DDEVICE9 device,
return hr;
}
HRESULT WINAPI D3DXCheckVolumeTextureRequirements(LPDIRECT3DDEVICE9 device,
UINT *width,
UINT *height,
UINT *depth,
UINT *miplevels,
DWORD usage,
D3DFORMAT *format,
D3DPOOL pool)
HRESULT WINAPI D3DXCheckVolumeTextureRequirements(struct IDirect3DDevice9 *device, UINT *width, UINT *height,
UINT *depth, UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool)
{
D3DCAPS9 caps;
UINT w = width ? *width : D3DX_DEFAULT;
......
include/d3dx9anim.h
View file @ 4ba69743
......@@ -367,10 +367,17 @@ DECLARE_INTERFACE_(ID3DXAnimationController, IUnknown)
extern "C" {
#endif
HRESULT WINAPI D3DXLoadMeshHierarchyFromXA(LPCSTR, DWORD, LPDIRECT3DDEVICE9, LPD3DXALLOCATEHIERARCHY, LPD3DXLOADUSERDATA, LPD3DXFRAME*, LPD3DXANIMATIONCONTROLLER*);
HRESULT WINAPI D3DXLoadMeshHierarchyFromXW(LPCWSTR, DWORD, LPDIRECT3DDEVICE9, LPD3DXALLOCATEHIERARCHY, LPD3DXLOADUSERDATA, LPD3DXFRAME*, LPD3DXANIMATIONCONTROLLER*);
HRESULT WINAPI D3DXLoadMeshHierarchyFromXA(const char *filename, DWORD flags, struct IDirect3DDevice9 *device,
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)
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 D3DXSaveMeshHierarchyToFileW(LPCWSTR, DWORD, CONST D3DXFRAME*, LPD3DXANIMATIONCONTROLLER, LPD3DXSAVEUSERDATA);
#define D3DXSaveMeshHierarchyToFile WINELIB_NAME_AW(D3DXSaveMeshHierarchyToFile)
......
include/d3dx9core.h
View file @ 4ba69743
......@@ -131,7 +131,7 @@ DECLARE_INTERFACE_(ID3DXFont, IUnknown)
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXFont methods ***/
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9 *device) PURE;
STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE;
STDMETHOD(GetDescA)(THIS_ D3DXFONT_DESCA *desc) PURE;
STDMETHOD(GetDescW)(THIS_ D3DXFONT_DESCW *desc) PURE;
STDMETHOD_(BOOL, GetTextMetricsA)(THIS_ TEXTMETRICA *metrics) PURE;
......@@ -212,7 +212,7 @@ DECLARE_INTERFACE_(ID3DXLine, IUnknown)
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXLine methods ***/
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9 *device) PURE;
STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE;
STDMETHOD(Begin)(THIS) 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;
/*** ID3DXRenderToEnvMap methods ***/
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9 *device) PURE;
STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE;
STDMETHOD(GetDesc)(THIS_ D3DXRTE_DESC *desc) PURE;
STDMETHOD(BeginCube)(THIS_ struct IDirect3DCubeTexture9 *cubetex) PURE;
......@@ -368,7 +368,7 @@ DECLARE_INTERFACE_(ID3DXRenderToSurface, IUnknown)
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXRenderToSurface methods ***/
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9 *device) PURE;
STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE;
STDMETHOD(GetDesc)(THIS_ D3DXRTS_DESC *desc) 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, Release)(THIS) PURE;
/*** ID3DXSprite methods ***/
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9 *device) PURE;
STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE;
STDMETHOD(GetTransform)(THIS_ D3DXMATRIX *transform) PURE;
STDMETHOD(SetTransform)(THIS_ CONST D3DXMATRIX *transform) PURE;
......@@ -475,20 +475,26 @@ extern "C" {
#endif
BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers);
HRESULT WINAPI D3DXCreateFontA(LPDIRECT3DDEVICE9 device, INT height, UINT width, UINT weight, UINT miplevels, BOOL italic, DWORD charset,
DWORD precision, DWORD quality, DWORD pitchandfamily, LPCSTR facename, LPD3DXFONT *font);
HRESULT WINAPI D3DXCreateFontW(LPDIRECT3DDEVICE9 device, INT height, UINT width, UINT weight, UINT miplevels, BOOL italic, DWORD charset,
DWORD precision, DWORD quality, DWORD pitchandfamily, LPCWSTR facename, LPD3DXFONT *font);
HRESULT WINAPI D3DXCreateFontA(struct IDirect3DDevice9 *device, INT height, UINT width, UINT weight,
UINT miplevels, BOOL italic, DWORD charset, DWORD precision, DWORD quality, DWORD pitchandfamily,
const char *facename, struct ID3DXFont **font);
HRESULT WINAPI D3DXCreateFontW(struct IDirect3DDevice9 *device, INT height, UINT width, UINT weight,
UINT miplevels, BOOL italic, DWORD charset, DWORD precision, DWORD quality, DWORD pitchandfamily,
const WCHAR *facename, struct ID3DXFont **font);
#define D3DXCreateFont WINELIB_NAME_AW(D3DXCreateFont)
HRESULT WINAPI D3DXCreateFontIndirectA(LPDIRECT3DDEVICE9 device, CONST D3DXFONT_DESCA *desc, LPD3DXFONT *font);
HRESULT WINAPI D3DXCreateFontIndirectW(LPDIRECT3DDEVICE9 device, CONST D3DXFONT_DESCW *desc, LPD3DXFONT *font);
HRESULT WINAPI D3DXCreateFontIndirectA(struct IDirect3DDevice9 *device,
const D3DXFONT_DESCA *desc, struct ID3DXFont **font);
HRESULT WINAPI D3DXCreateFontIndirectW(struct IDirect3DDevice9 *device,
const D3DXFONT_DESCW *desc, struct ID3DXFont **font);
#define D3DXCreateFontIndirect WINELIB_NAME_AW(D3DXCreateFontIndirect)
HRESULT WINAPI D3DXCreateLine(LPDIRECT3DDEVICE9 device, LPD3DXLINE *line);
HRESULT WINAPI D3DXCreateRenderToEnvMap(LPDIRECT3DDEVICE9 device, UINT size, UINT miplevels, D3DFORMAT format, BOOL stencil, D3DFORMAT stencil_format, LPD3DXRenderToEnvMap *rtem);
HRESULT WINAPI D3DXCreateRenderToSurface(LPDIRECT3DDEVICE9 device, UINT width, UINT height, D3DFORMAT format, BOOL stencil, D3DFORMAT stencil_format, LPD3DXRENDERTOSURFACE *rts);
HRESULT WINAPI D3DXCreateSprite(LPDIRECT3DDEVICE9 device, LPD3DXSPRITE *sprite);
HRESULT WINAPI D3DXCreateLine(struct IDirect3DDevice9 *device, struct ID3DXLine **line);
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(LPDIRECT3DDEVICE9 device);
UINT WINAPI D3DXGetDriverLevel(struct IDirect3DDevice9 *device);
#ifdef __cplusplus
}
......
include/d3dx9shader.h
View file @ 4ba69743
......@@ -133,22 +133,32 @@ DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer)
STDMETHOD_(D3DXHANDLE, GetConstant)(THIS_ D3DXHANDLE hConstant, UINT Index) PURE;
STDMETHOD_(D3DXHANDLE, GetConstantByName)(THIS_ D3DXHANDLE hConstant, LPCSTR pName) PURE;
STDMETHOD_(D3DXHANDLE, GetConstantElement)(THIS_ D3DXHANDLE hConstant, UINT Index) PURE;
STDMETHOD(SetDefaults)(THIS_ LPDIRECT3DDEVICE9 pDevice) PURE;
STDMETHOD(SetValue)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, LPCVOID pData, UINT Bytes) PURE;
STDMETHOD(SetBool)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, BOOL b) PURE;
STDMETHOD(SetBoolArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST BOOL* pb, UINT Count) PURE;
STDMETHOD(SetInt)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, INT n) PURE;
STDMETHOD(SetIntArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST INT* pn, UINT Count) PURE;
STDMETHOD(SetFloat)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, FLOAT f) PURE;
STDMETHOD(SetFloatArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST FLOAT* pf, UINT Count) PURE;
STDMETHOD(SetVector)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXVECTOR4* pVector) PURE;
STDMETHOD(SetVectorArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXVECTOR4* pVector, UINT Count) PURE;
STDMETHOD(SetMatrix)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX* pMatrix) PURE;
STDMETHOD(SetMatrixArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX* pMatrix, UINT Count) PURE;
STDMETHOD(SetMatrixPointerArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX** ppMatrix, UINT Count) PURE;
STDMETHOD(SetMatrixTranspose)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX* pMatrix) PURE;
STDMETHOD(SetMatrixTransposeArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX* pMatrix, UINT Count) PURE;
STDMETHOD(SetMatrixTransposePointerArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX** ppMatrix, UINT Count) PURE;
STDMETHOD(SetDefaults)(THIS_ struct IDirect3DDevice9 *device) PURE;
STDMETHOD(SetValue)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant,
const void *data, UINT data_size) PURE;
STDMETHOD(SetBool)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant, BOOL value) PURE;
STDMETHOD(SetBoolArray)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant,
const BOOL *values, UINT value_count) PURE;
STDMETHOD(SetInt)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant, INT value) PURE;
STDMETHOD(SetIntArray)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant,
const INT *values, UINT value_count) PURE;
STDMETHOD(SetFloat)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant, float value) PURE;
STDMETHOD(SetFloatArray)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant,
const float *values, UINT value_count) PURE;
STDMETHOD(SetVector)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant, const D3DXVECTOR4 *value) PURE;
STDMETHOD(SetVectorArray)(THIS_ struct IDirect3DDevice9 *device, D3DXHANDLE constant,
const D3DXVECTOR4 *values, UINT value_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
......@@ -253,10 +263,10 @@ typedef struct ID3DXInclude *LPD3DXINCLUDE;
extern "C" {
#endif
LPCSTR WINAPI D3DXGetPixelShaderProfile(LPDIRECT3DDEVICE9 device);
const char * WINAPI D3DXGetPixelShaderProfile(struct IDirect3DDevice9 *device);
UINT WINAPI D3DXGetShaderSize(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 D3DXGetShaderSamplers(CONST DWORD *byte_code, LPCSTR *samplers, UINT *count);
......
include/d3dx9shape.h
View file @ 4ba69743
......@@ -25,50 +25,18 @@
extern "C" {
#endif
HRESULT WINAPI D3DXCreateBox(LPDIRECT3DDEVICE9 device,
FLOAT width,
FLOAT height,
FLOAT depth,
LPD3DXMESH* mesh,
LPD3DXBUFFER* adjacency);
HRESULT WINAPI D3DXCreateSphere(LPDIRECT3DDEVICE9 device,
FLOAT radius,
UINT slices,
UINT stacks,
LPD3DXMESH* mesh,
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);
HRESULT WINAPI D3DXCreateBox(struct IDirect3DDevice9 *device, float width, float height,
float depth, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency);
HRESULT WINAPI D3DXCreateCylinder(struct IDirect3DDevice9 *device, float radius1, float radius2,
float length, UINT slices, UINT stacks, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency);
HRESULT WINAPI D3DXCreateSphere(struct IDirect3DDevice9 *device, float radius, UINT slices,
UINT stacks, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency);
HRESULT WINAPI D3DXCreateTeapot(struct IDirect3DDevice9 *device,
struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency);
HRESULT WINAPI D3DXCreateTextA(struct IDirect3DDevice9 *device, HDC hdc, const char *text, float deviation,
float extrusion, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency, GLYPHMETRICSFLOAT *glyphmetrics);
HRESULT WINAPI D3DXCreateTextW(struct IDirect3DDevice9 *device, HDC hdc, const WCHAR *text, float deviation,
FLOAT extrusion, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency, GLYPHMETRICSFLOAT *glyphmetrics);
#define D3DXCreateText WINELIB_NAME_AW(D3DXCreateText)
#ifdef __cplusplus
......
include/d3dx9tex.h
View file @ 4ba69743
......@@ -182,28 +182,12 @@ HRESULT WINAPI D3DXSaveVolumeToFileW(const WCHAR *destfile, D3DXIMAGE_FILEFORMAT
/* Texture, cube texture and volume texture creation */
HRESULT WINAPI D3DXCheckTextureRequirements( LPDIRECT3DDEVICE9 device,
UINT *width,
UINT *height,
UINT *miplevels,
DWORD usage,
D3DFORMAT *format,
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 D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UINT *width, UINT *height,
UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool);
HRESULT WINAPI D3DXCheckCubeTextureRequirements(struct IDirect3DDevice9 *device, UINT *size,
UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool);
HRESULT WINAPI D3DXCheckVolumeTextureRequirements(struct IDirect3DDevice9 *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,
UINT miplevels, DWORD usage, D3DFORMAT format, D3DPOOL pool, struct IDirect3DTexture9 **texture);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment