d3dx9: Avoid LPD3DXEFFECTPOOL.

This commit is contained in:
Henri Verbeet 2012-11-29 22:44:42 +01:00 committed by Alexandre Julliard
parent a6db668895
commit 8678e890e6
2 changed files with 4 additions and 4 deletions

View file

@ -3406,7 +3406,7 @@ static HRESULT WINAPI ID3DXEffectImpl_SetArrayRange(ID3DXEffect *iface, D3DXHAND
}
/*** ID3DXEffect methods ***/
static HRESULT WINAPI ID3DXEffectImpl_GetPool(ID3DXEffect *iface, LPD3DXEFFECTPOOL *pool)
static HRESULT WINAPI ID3DXEffectImpl_GetPool(ID3DXEffect *iface, ID3DXEffectPool **pool)
{
struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface);
@ -5969,7 +5969,7 @@ static const struct ID3DXEffectPoolVtbl ID3DXEffectPool_Vtbl =
ID3DXEffectPoolImpl_Release
};
HRESULT WINAPI D3DXCreateEffectPool(LPD3DXEFFECTPOOL *pool)
HRESULT WINAPI D3DXCreateEffectPool(ID3DXEffectPool **pool)
{
struct ID3DXEffectPoolImpl *object;

View file

@ -258,7 +258,7 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect)
STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) PURE;
STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE;
/*** ID3DXEffect methods ***/
STDMETHOD(GetPool)(THIS_ LPD3DXEFFECTPOOL* pool) PURE;
STDMETHOD(GetPool)(THIS_ ID3DXEffectPool **pool) PURE;
STDMETHOD(SetTechnique)(THIS_ D3DXHANDLE technique) PURE;
STDMETHOD_(D3DXHANDLE, GetCurrentTechnique)(THIS) PURE;
STDMETHOD(ValidateTechnique)(THIS_ D3DXHANDLE technique) PURE;
@ -363,7 +363,7 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect)
extern "C" {
#endif
HRESULT WINAPI D3DXCreateEffectPool(LPD3DXEFFECTPOOL* pool);
HRESULT WINAPI D3DXCreateEffectPool(ID3DXEffectPool **pool);
HRESULT WINAPI D3DXCreateEffect(struct IDirect3DDevice9 *device, const void *srcdata, UINT srcdatalen,
const D3DXMACRO *defines, struct ID3DXInclude *include, DWORD flags,
struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);