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

d3dx9_36: Implement D3DXCreateEffectEx and make D3DXCreateEffect use it.

This commit is contained in:
Christian Costa 2010-03-25 08:41:18 +01:00 committed by Alexandre Julliard
parent 947fe3a564
commit 39b60870ff
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
dlls/d3dx9_36/effect.c
View File

@ -848,20 +848,21 @@ static const struct ID3DXEffectVtbl ID3DXEffect_Vtbl =
ID3DXEffectImpl_SetRawValue
};
HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device,
LPCVOID srcdata,
UINT srcdatalen,
CONST D3DXMACRO* defines,
LPD3DXINCLUDE include,
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)
{
ID3DXEffectImpl* object;
FIXME("(%p, %p, %u, %p, %p, %#x, %p, %p, %p): semi-stub\n", device, srcdata, srcdatalen, defines, include, flags,
pool, effect, compilation_errors);
FIXME("(%p, %p, %u, %p, %p, %p, %#x, %p, %p, %p): semi-stub\n", device, srcdata, srcdatalen, defines, include,
skip_constants, flags, pool, effect, compilation_errors);
if (!device || !srcdata)
return D3DERR_INVALIDCALL;
@ -888,6 +889,22 @@ HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device,
return D3D_OK;
}
HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device,
LPCVOID srcdata,
UINT srcdatalen,
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,
include, flags, pool, effect, compilation_errors);
return D3DXCreateEffectEx(device, srcdata, srcdatalen, defines, include, NULL, flags, pool, effect, compilation_errors);
}
HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata,
UINT srcdatalen,
CONST D3DXMACRO* defines,

11
include/d3dx9effect.h
View File

@ -368,6 +368,17 @@ HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device,
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,
UINT srcdatalen,
CONST D3DXMACRO* defines,