Commit 9b19d755 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

d3dx9: Avoid LPDIRECT3DCUBETEXTURE9.

parent 17e33e9b
...@@ -949,13 +949,8 @@ HRESULT WINAPI D3DXCreateTextureFromResourceExW(LPDIRECT3DDEVICE9 device, ...@@ -949,13 +949,8 @@ HRESULT WINAPI D3DXCreateTextureFromResourceExW(LPDIRECT3DDEVICE9 device,
return D3DXERR_INVALIDDATA; return D3DXERR_INVALIDDATA;
} }
HRESULT WINAPI D3DXCreateCubeTexture(LPDIRECT3DDEVICE9 device, HRESULT WINAPI D3DXCreateCubeTexture(struct IDirect3DDevice9 *device, UINT size, UINT miplevels,
UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool, struct IDirect3DCubeTexture9 **texture)
UINT miplevels,
DWORD usage,
D3DFORMAT format,
D3DPOOL pool,
LPDIRECT3DCUBETEXTURE9 *texture)
{ {
HRESULT hr; HRESULT hr;
...@@ -976,10 +971,8 @@ HRESULT WINAPI D3DXCreateCubeTexture(LPDIRECT3DDEVICE9 device, ...@@ -976,10 +971,8 @@ HRESULT WINAPI D3DXCreateCubeTexture(LPDIRECT3DDEVICE9 device,
return IDirect3DDevice9_CreateCubeTexture(device, size, miplevels, usage, format, pool, texture, NULL); return IDirect3DDevice9_CreateCubeTexture(device, size, miplevels, usage, format, pool, texture, NULL);
} }
HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemory(LPDIRECT3DDEVICE9 device, HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemory(struct IDirect3DDevice9 *device,
LPCVOID data, const void *data, UINT datasize, struct IDirect3DCubeTexture9 **texture)
UINT datasize,
LPDIRECT3DCUBETEXTURE9 *texture)
{ {
TRACE("(%p, %p, %u, %p)\n", device, data, datasize, texture); TRACE("(%p, %p, %u, %p)\n", device, data, datasize, texture);
...@@ -1704,9 +1697,7 @@ static float get_cube_coord(enum cube_coord coord, unsigned int x, unsigned int ...@@ -1704,9 +1697,7 @@ static float get_cube_coord(enum cube_coord coord, unsigned int x, unsigned int
} }
} }
HRESULT WINAPI D3DXFillCubeTexture(LPDIRECT3DCUBETEXTURE9 texture, HRESULT WINAPI D3DXFillCubeTexture(struct IDirect3DCubeTexture9 *texture, LPD3DXFILL3D function, void *funcdata)
LPD3DXFILL3D function,
LPVOID funcdata)
{ {
DWORD miplevels; DWORD miplevels;
DWORD m, i, x, y, c, f, v; DWORD m, i, x, y, c, f, v;
......
...@@ -303,7 +303,7 @@ DECLARE_INTERFACE_(ID3DXRenderToEnvMap, IUnknown) ...@@ -303,7 +303,7 @@ DECLARE_INTERFACE_(ID3DXRenderToEnvMap, IUnknown)
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9 *device) PURE; STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9 *device) PURE;
STDMETHOD(GetDesc)(THIS_ D3DXRTE_DESC *desc) PURE; STDMETHOD(GetDesc)(THIS_ D3DXRTE_DESC *desc) PURE;
STDMETHOD(BeginCube)(THIS_ LPDIRECT3DCUBETEXTURE9 cubetex) PURE; STDMETHOD(BeginCube)(THIS_ struct IDirect3DCubeTexture9 *cubetex) PURE;
STDMETHOD(BeginSphere)(THIS_ LPDIRECT3DTEXTURE9 tex) PURE; STDMETHOD(BeginSphere)(THIS_ LPDIRECT3DTEXTURE9 tex) PURE;
STDMETHOD(BeginHemisphere)(THIS_ LPDIRECT3DTEXTURE9 texzpos, LPDIRECT3DTEXTURE9 texzneg) PURE; STDMETHOD(BeginHemisphere)(THIS_ LPDIRECT3DTEXTURE9 texzpos, LPDIRECT3DTEXTURE9 texzneg) PURE;
STDMETHOD(BeginParabolic)(THIS_ LPDIRECT3DTEXTURE9 texzpos, LPDIRECT3DTEXTURE9 texzneg) PURE; STDMETHOD(BeginParabolic)(THIS_ LPDIRECT3DTEXTURE9 texzpos, LPDIRECT3DTEXTURE9 texzneg) PURE;
......
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