Skip to content

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

d3dx9: Avoid LPD3DXEFFECTPOOL.

parent a6db6688
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
dlls/d3dx9_36/effect.c
View file @ 8678e890
...@@ -3406,7 +3406,7 @@ static HRESULT WINAPI ID3DXEffectImpl_SetArrayRange(ID3DXEffect *iface, D3DXHAND ...@@ -3406,7 +3406,7 @@ static HRESULT WINAPI ID3DXEffectImpl_SetArrayRange(ID3DXEffect *iface, D3DXHAND
} }
/*** ID3DXEffect methods ***/ /*** 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); struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface);
...@@ -5969,7 +5969,7 @@ static const struct ID3DXEffectPoolVtbl ID3DXEffectPool_Vtbl = ...@@ -5969,7 +5969,7 @@ static const struct ID3DXEffectPoolVtbl ID3DXEffectPool_Vtbl =
ID3DXEffectPoolImpl_Release ID3DXEffectPoolImpl_Release
}; };
HRESULT WINAPI D3DXCreateEffectPool(LPD3DXEFFECTPOOL *pool) HRESULT WINAPI D3DXCreateEffectPool(ID3DXEffectPool **pool)
{ {
struct ID3DXEffectPoolImpl *object; struct ID3DXEffectPoolImpl *object;
......
include/d3dx9effect.h
View file @ 8678e890
...@@ -258,7 +258,7 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect) ...@@ -258,7 +258,7 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect)
STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) PURE; STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) PURE;
STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE; STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE;
/*** ID3DXEffect methods ***/ /*** ID3DXEffect methods ***/
STDMETHOD(GetPool)(THIS_ LPD3DXEFFECTPOOL* pool) PURE; STDMETHOD(GetPool)(THIS_ ID3DXEffectPool **pool) PURE;
STDMETHOD(SetTechnique)(THIS_ D3DXHANDLE technique) PURE; STDMETHOD(SetTechnique)(THIS_ D3DXHANDLE technique) PURE;
STDMETHOD_(D3DXHANDLE, GetCurrentTechnique)(THIS) PURE; STDMETHOD_(D3DXHANDLE, GetCurrentTechnique)(THIS) PURE;
STDMETHOD(ValidateTechnique)(THIS_ D3DXHANDLE technique) PURE; STDMETHOD(ValidateTechnique)(THIS_ D3DXHANDLE technique) PURE;
...@@ -363,7 +363,7 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect) ...@@ -363,7 +363,7 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect)
extern "C" { extern "C" {
#endif #endif
HRESULT WINAPI D3DXCreateEffectPool(LPD3DXEFFECTPOOL* pool); HRESULT WINAPI D3DXCreateEffectPool(ID3DXEffectPool **pool);
HRESULT WINAPI D3DXCreateEffect(struct IDirect3DDevice9 *device, const void *srcdata, UINT srcdatalen, HRESULT WINAPI D3DXCreateEffect(struct IDirect3DDevice9 *device, const void *srcdata, UINT srcdatalen,
const D3DXMACRO *defines, struct ID3DXInclude *include, DWORD flags, const D3DXMACRO *defines, struct ID3DXInclude *include, DWORD flags,
struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors); struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);
......
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