Module: wine Branch: master Commit: fb6c973b4be113d4a1cf72329820b37422f68e5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb6c973b4be113d4a1cf723298...
Author: Rico Schüller kgbricola@web.de Date: Mon Jun 27 11:58:24 2011 +0200
d3dx9: Implement ID3DXEffect::BeginPass().
---
dlls/d3dx9_36/effect.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a1bdc5d..79b53b1 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -166,6 +166,7 @@ struct ID3DXEffectImpl LPDIRECT3DDEVICE9 device; LPD3DXEFFECTPOOL pool; D3DXHANDLE active_technique; + D3DXHANDLE active_pass;
ID3DXBaseEffect *base_effect; }; @@ -2819,13 +2820,25 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW return D3DERR_INVALIDCALL; }
-static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect* iface, UINT pass) +static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_technique *technique = get_technique_struct(This->active_technique);
- FIXME("(%p)->(%u): stub\n", This, pass); + TRACE("iface %p, pass %u\n", This, pass);
- return E_NOTIMPL; + if (technique && pass < technique->pass_count && !This->active_pass) + { + This->active_pass = technique->pass_handles[pass]; + + FIXME("No states applied, yet!\n"); + + return D3D_OK; + } + + WARN("Invalid argument supplied.\n"); + + return D3DERR_INVALIDCALL; }
static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect* iface) @@ -5012,6 +5025,7 @@ static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, LPDIRECT3DDEVIC if (object->technique_handles) { effect->active_technique = object->technique_handles[0]; + effect->active_pass = NULL; }
return D3D_OK;